Index: webrtc/modules/desktop_capture/screen_capturer_integration_test.cc |
diff --git a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc |
index 355f62dfa5608cb3e5f9fef1891368324e340f29..f00fd018acecbf256c3826f26a87dd9124c24e63 100644 |
--- a/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc |
+++ b/webrtc/modules/desktop_capture/screen_capturer_integration_test.cc |
@@ -259,13 +259,13 @@ class ScreenCapturerIntegrationTest : public testing::Test { |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
kjellander_webrtc
2016/11/21 06:49:10
Please also clean up the comments about disabling
|
-TEST_F(ScreenCapturerIntegrationTest, DISABLED_CaptureUpdatedRegion) { |
+TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegion) { |
TestCaptureUpdatedRegion(); |
} |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
-TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoCapturers) { |
+TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) { |
std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); |
SetUp(); |
TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
@@ -276,7 +276,7 @@ TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoCapturers) { |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
TEST_F(ScreenCapturerIntegrationTest, |
- DISABLED_CaptureUpdatedRegionWithDirectxCapturer) { |
+ CaptureUpdatedRegionWithDirectxCapturer) { |
if (!CreateDirectxCapturer()) { |
return; |
} |
@@ -286,7 +286,7 @@ TEST_F(ScreenCapturerIntegrationTest, |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
-TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoDirectxCapturers) { |
+TEST_F(ScreenCapturerIntegrationTest, TwoDirectxCapturers) { |
if (!CreateDirectxCapturer()) { |
return; |
} |
@@ -299,14 +299,14 @@ TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoDirectxCapturers) { |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
TEST_F(ScreenCapturerIntegrationTest, |
- DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) { |
+ CaptureUpdatedRegionWithMagnifierCapturer) { |
CreateMagnifierCapturer(); |
TestCaptureUpdatedRegion(); |
} |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
-TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoMagnifierCapturers) { |
+TEST_F(ScreenCapturerIntegrationTest, TwoMagnifierCapturers) { |
CreateMagnifierCapturer(); |
std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); |
CreateMagnifierCapturer(); |
@@ -316,7 +316,7 @@ TEST_F(ScreenCapturerIntegrationTest, DISABLED_TwoMagnifierCapturers) { |
// Disabled because it's flaky. |
// https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
TEST_F(ScreenCapturerIntegrationTest, |
- DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) { |
+ MaybeCaptureUpdatedRegionWithDirectxCapturer) { |
// Even DirectX capturer is not supported in current system, we should be able |
// to select a usable capturer. |
MaybeCreateDirectxCapturer(); |