Several minor changes to ScreenCapturerWinMagnifier

webrtc/modules/desktop_capture/screen_capturer_unittest.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
@@ skipping 259 matching lines @@
 
   // Verify that the region contains whole screen.
   EXPECT_FALSE(frame->updated_region().is_empty());
   DesktopRegion::Iterator it(frame->updated_region());
   ASSERT_TRUE(!it.IsAtEnd());
   EXPECT_TRUE(it.rect().equals(DesktopRect::MakeSize(frame->size())));
   it.Advance();
   EXPECT_TRUE(it.IsAtEnd());
 }
 
-// Disabled due to being flaky due to the fact that it useds rendering / UI,
-// see webrtc/6366.
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
 TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegion) {
   TestCaptureUpdatedRegion();
 }
 
-// Disabled due to being flaky due to the fact that it useds rendering / UI,
-// see webrtc/6366.
-// TODO(zijiehe): Find out the reason of failure of this test on trybot.
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
 TEST_F(ScreenCapturerTest, DISABLED_TwoCapturers) {
   std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
   SetUp();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
 #if defined(WEBRTC_WIN)
 
 TEST_F(ScreenCapturerTest, UseSharedBuffers) {
   std::unique_ptr<DesktopFrame> frame;
@@ skipping 51 matching lines @@
 
   capturer_->Start(&callback_);
   capturer_->SetSharedMemoryFactory(
       std::unique_ptr<SharedMemoryFactory>(new FakeSharedMemoryFactory()));
   capturer_->Capture(DesktopRegion());
   ASSERT_TRUE(frame);
   ASSERT_TRUE(frame->shared_memory());
   EXPECT_EQ(frame->shared_memory()->id(), kTestSharedMemoryId);
 }
 
-// Disabled due to being flaky due to the fact that it useds rendering / UI,
-// see webrtc/6366.
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
 TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithDirectxCapturer) {
   if (!CreateDirectxCapturer()) {
     return;
   }
 
   TestCaptureUpdatedRegion();
 }
 
-// Disabled due to being flaky due to the fact that it useds rendering / UI,
-// see webrtc/6366.
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
 TEST_F(ScreenCapturerTest, DISABLED_TwoDirectxCapturers) {
   if (!CreateDirectxCapturer()) {
     return;
   }
 
   std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
   RTC_CHECK(CreateDirectxCapturer());
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
-// Disabled due to being flaky due to the fact that it useds rendering / UI,
-// see webrtc/6366.
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
+TEST_F(ScreenCapturerTest, DISABLED_CaptureUpdatedRegionWithMagnifierCapturer) {
+  CreateMagnifierCapturer();
+  TestCaptureUpdatedRegion();
+}
+
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
 TEST_F(ScreenCapturerTest, DISABLED_TwoMagnifierCapturers) {
   CreateMagnifierCapturer();
   std::unique_ptr<ScreenCapturer> capturer2 = std::move(capturer_);
   CreateMagnifierCapturer();
   TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()});
 }
 
-// Disabled due to being flaky due to the fact that it useds rendering / UI,
-// see webrtc/6366.
+// Disabled due to being flaky due to the fact that it uses rendering / UI, see
+// webrtc/6366.
 TEST_F(ScreenCapturerTest,
        DISABLED_MaybeCaptureUpdatedRegionWithDirectxCapturer) {
   // Even DirectX capturer is not supported in current system, we should be able
   // to select a usable capturer.
   MaybeCreateDirectxCapturer();
   TestCaptureUpdatedRegion();
 }
 
 #endif  // defined(WEBRTC_WIN)
 
 }  // namespace webrtc