| Index: webrtc/modules/desktop_capture/screen_capturer_unittest.cc
|
| diff --git a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
|
| index cb639b9e91e5c987190c58a2404fd1b8f5c6893a..490adf9b5a046ea46d60fbe43d0f6253d3b5f3fe 100644
|
| --- a/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
|
| +++ b/webrtc/modules/desktop_capture/screen_capturer_unittest.cc
|
| @@ -271,11 +271,12 @@ TEST_F(ScreenCapturerTest, Capture) {
|
| EXPECT_TRUE(it.IsAtEnd());
|
| }
|
|
|
| -TEST_F(ScreenCapturerTest, CaptureUpdatedRegion) {
|
| +// TODO(zijiehe): Bug 647067 is tracking the reason of flaky of following
|
| +// disabled tests.
|
| +TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegion) {
|
| TestCaptureUpdatedRegion();
|
| }
|
|
|
| -// TODO(zijiehe): Find out the reason of failure of this test on trybot.
|
| TEST_F(ScreenCapturerTest, DISABLED_TwoCapturers) {
|
| std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
|
| SetUp();
|
| @@ -347,7 +348,7 @@ TEST_F(ScreenCapturerTest, UseDirectxCapturerWithSharedBuffers) {
|
| EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId);
|
| }
|
|
|
| -TEST_F(ScreenCapturerTest, CaptureUpdatedRegionWithDirectxCapturer) {
|
| +TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithDirectxCapturer) {
|
| if (!CreateDirectxCapturer()) {
|
| return;
|
| }
|
| @@ -355,7 +356,7 @@ TEST_F(ScreenCapturerTest, CaptureUpdatedRegionWithDirectxCapturer) {
|
| TestCaptureUpdatedRegion();
|
| }
|
|
|
| -TEST_F(ScreenCapturerTest, TwoDirectxCapturers) {
|
| +TEST_F(ScreenCapturerTest, DISABLED_TwoDirectxCapturers) {
|
| if (!CreateDirectxCapturer()) {
|
| return;
|
| }
|
| @@ -365,7 +366,7 @@ TEST_F(ScreenCapturerTest, TwoDirectxCapturers) {
|
| TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
|
| }
|
|
|
| -TEST_F(ScreenCapturerTest, TwoMagnifierCapturers) {
|
| +TEST_F(ScreenCapturerTest, DISABLED_TwoMagnifierCapturers) {
|
| CreateMagnifierCapturer();
|
| std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
|
| CreateMagnifierCapturer();
|
|
|