zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."

Browse Source 
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.

http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457


> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
> 
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/12199004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/14479004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org
2014-05-13 08:15:48 +00:00
parent 3a5825909d
commit e9a604accd
386 changed files with 6 additions and 84973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
webrtc/base/macwindowpicker_unittest.cc
View File

@ -1,45 +0,0 @@
/*
* Copyright 2010 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/base/gunit.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/macutils.h"
#include "webrtc/base/macwindowpicker.h"
#include "webrtc/base/windowpicker.h"
#if !defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
#error Only for WEBRTC_MAC && !WEBRTC_IOS
#endif
namespace rtc {
bool IsLeopardOrLater() {
return GetOSVersionName() >= kMacOSLeopard;
}
// Test that this works on new versions and fails acceptably on old versions.
TEST(MacWindowPickerTest, TestGetWindowList) {
MacWindowPicker picker, picker2;
WindowDescriptionList descriptions;
if (IsLeopardOrLater()) {
EXPECT_TRUE(picker.Init());
EXPECT_TRUE(picker.GetWindowList(&descriptions));
EXPECT_TRUE(picker2.GetWindowList(&descriptions)); // Init is optional
} else {
EXPECT_FALSE(picker.Init());
EXPECT_FALSE(picker.GetWindowList(&descriptions));
EXPECT_FALSE(picker2.GetWindowList(&descriptions));
}
}
// TODO: Add verification of the actual parsing, ie, add
// functionality to inject a fake get_window_array function which
// provide a pre-constructed list of windows.
} // namespace rtc