Reland "Tab (and AuraWindow) Capture: Capture refresh frame after Resume()"

content/browser/media/capture/web_contents_video_capture_device_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 994 matching lines @@
 
     // Suspend capture and then draw a GREEN frame. No frame capture should
     // occur.
     device()->MaybeSuspend();
     base::RunLoop().RunUntilIdle();
     client_observer()->SetIsExpectingFrames(false);
     test_view()->SetSolidColor(SK_ColorGREEN);
     SimulateDrawEvent();
     base::RunLoop().RunUntilIdle();
 
-    // Resume capture and then draw a BLUE frame and wait for it to be captured.
+    // Resume capture and expect a GREEN update frame to be captured.
+    client_observer()->SetIsExpectingFrames(true);
     device()->Resume();
-    base::RunLoop().RunUntilIdle();
-    client_observer()->SetIsExpectingFrames(true);
+    ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorGREEN));
+
+    // Draw a BLUE frame and wait for it to be captured.
     test_view()->SetSolidColor(SK_ColorBLUE);
     SimulateDrawEvent();
     ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorBLUE));
   }
 
   device()->StopAndDeAllocate();
 }
 
 // Tests the RequestRefreshFrame() functionality.
 TEST_F(WebContentsVideoCaptureDeviceTest, ProvidesRefreshFrames) {
@@ skipping 18 matching lines @@
   for (int i = 0; i < 3; ++i) {
     SimulateRefreshFrameRequest();
     ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorGREEN));
   }
 
   device()->StopAndDeAllocate();
 }
 
 }  // namespace
 }  // namespace content