ImageCapture: Queue up requests while device not ready

content/browser/webrtc/webrtc_image_capture_browsertest.cc

Index: content/browser/webrtc/webrtc_image_capture_browsertest.cc
diff --git a/content/browser/webrtc/webrtc_image_capture_browsertest.cc b/content/browser/webrtc/webrtc_image_capture_browsertest.cc
index 3c8303b30d27f86774aacb26cb58b1b5b15328af..19ffda4fe504877b185ab504f6a41e3f2622b639 100644
--- a/content/browser/webrtc/webrtc_image_capture_browsertest.cc
+++ b/content/browser/webrtc/webrtc_image_capture_browsertest.cc
@@ -20,29 +20,26 @@ static const char kImageCaptureHtmlFile[] = "/media/image_capture_test.html";
 // platforms where the ImageCaptureCode is landed, https://crbug.com/518807.
 static struct TargetCamera {
   bool use_fake;
-} const kTestParameters[] = {{true}};
+}
+#if defined(OS_ANDROID)
+const kTestParameters[] = {{true}, {false}};
+#else
+const kTestParameters[] = {{true}};
+#endif
 
 }  // namespace
 
 namespace content {
 
-#if defined(OS_WIN)
-// This test is flaky on WebRTC Windows bots: https://crbug.com/633242.
-#define MAYBE_WebRtcImageCaptureBrowserTest \
-  DISABLED_WebRtcImageCaptureBrowserTest
-#else
-#define MAYBE_WebRtcImageCaptureBrowserTest WebRtcImageCaptureBrowserTest
-#endif
-
 // This class is the content_browsertests for Image Capture API, which allows
 // for capturing still images out of a MediaStreamTrack. Is a
 // WebRtcWebcamBrowserTest to be able to use a physical camera.
-class MAYBE_WebRtcImageCaptureBrowserTest
+class WebRtcImageCaptureBrowserTest
     : public WebRtcWebcamBrowserTest,
       public testing::WithParamInterface<struct TargetCamera> {
  public:
-  MAYBE_WebRtcImageCaptureBrowserTest() = default;
-  ~MAYBE_WebRtcImageCaptureBrowserTest() override = default;
+  WebRtcImageCaptureBrowserTest() = default;
+  ~WebRtcImageCaptureBrowserTest() override = default;
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcWebcamBrowserTest::SetUpCommandLine(command_line);
@@ -68,11 +65,17 @@ class MAYBE_WebRtcImageCaptureBrowserTest
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MAYBE_WebRtcImageCaptureBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(WebRtcImageCaptureBrowserTest);
 };
 
-IN_PROC_BROWSER_TEST_P(MAYBE_WebRtcImageCaptureBrowserTest,
-                       CreateAndGetCapabilities) {
+#if defined(OS_WIN)
+// This test is flaky on WebRTC Windows bots: https://crbug.com/633242.
+#define MAYBE_CreateAndGetCapabilities DISABLED_CreateAndGetCapabilities
+#else
+#define MAYBE_CreateAndGetCapabilities CreateAndGetCapabilities
+#endif
+IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
+                       MAYBE_CreateAndGetCapabilities) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile));
   NavigateToURL(shell(), url);
@@ -85,8 +88,28 @@ IN_PROC_BROWSER_TEST_P(MAYBE_WebRtcImageCaptureBrowserTest,
   FAIL();
 }
 
+#if defined(OS_WIN)
+// This test is flaky on WebRTC Windows bots: https://crbug.com/633242.

[emircan, 2016/08/03 21:55:54]

I think it looked better before with one #ifdef(WIN), in comparison to having
two pointing to the same bug. Can you Bring back
MAYBE_WebRtcImageCaptureBrowserTest?

[mcasas, 2016/08/03 22:19:36]

Heh the problem is that the syntax is erroneous! It 
would disable the test for all platforms, not just for
OS_WIN as intended (see some recent test builder, 
e.g. [1, 2], search for "WebRtc" and then for 
"WebRtcImage").


[1]
https://build.chromium.org/p/chromium.mac/builders/Mac10.9%20Tests/builds/260...
[2]
https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/443...

+#define MAYBE_CreateAndTakePhoto DISABLED_CreateAndTakePhoto
+#else
+#define MAYBE_CreateAndTakePhoto CreateAndTakePhoto
+#endif
+IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
+                       MAYBE_CreateAndTakePhoto) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+  GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile));
+  NavigateToURL(shell(), url);
+
+  std::string result;
+  ASSERT_TRUE(ExecuteScriptAndExtractString(shell(), "testCreateAndTakePhoto()",
+                                            &result));
+  if (result == "OK")
+    return;
+  FAIL();
+}
+
 INSTANTIATE_TEST_CASE_P(,
-                        MAYBE_WebRtcImageCaptureBrowserTest,
+                        WebRtcImageCaptureBrowserTest,
                         testing::ValuesIn(kTestParameters));
 
 }  // namespace content