ImageCapture: avoid several grabFrame()s in flight, beef up content_browsertests

content/browser/webrtc/webrtc_image_capture_browsertest.cc

 // Copyright 2016 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 "base/command_line.h"
 #include "build/build_config.h"
 #include "content/browser/webrtc/webrtc_webcam_browsertest.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
+namespace content {
+
+#if defined(OS_WIN)
+// These tests are flaky on WebRTC Windows bots: https://crbug.com/633242.
+#define MAYBE_CreateAndGetCapabilities DISABLED_CreateAndGetCapabilities
+#define MAYBE_CreateAndTakePhoto DISABLED_CreateAndTakePhoto
+#define MAYBE_CreateAndGrabFrame DISABLED_CreateAndGrabFrame
+#else
+#define MAYBE_CreateAndGetCapabilities CreateAndGetCapabilities
+#define MAYBE_CreateAndTakePhoto CreateAndTakePhoto
+#define MAYBE_CreateAndGrabFrame CreateAndGrabFrame
+#endif
+
 namespace {
 
 static const char kImageCaptureHtmlFile[] = "/media/image_capture_test.html";
 
 // TODO(mcasas): enable real-camera tests by disabling the Fake Device for
 // platforms where the ImageCaptureCode is landed, https://crbug.com/518807.
 // TODO(mcasas): enable in Android when takePhoto() can be specified a (small)
 // capture resolution preventing the test from timeout https://crbug.com/634811.
 static struct TargetCamera {
   bool use_fake;
 } const kTestParameters[] = {{true}};
 
 }  // namespace
 
-namespace content {
-
 // 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 WebRtcImageCaptureBrowserTest
     : public WebRtcWebcamBrowserTest,
       public testing::WithParamInterface<struct TargetCamera> {
  public:
   WebRtcImageCaptureBrowserTest() = default;
   ~WebRtcImageCaptureBrowserTest() override = default;
 
@@ skipping 13 matching lines @@
     // TODO(mcasas): remove after https://crbug.com/503227 is closed.
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kEnableBlinkFeatures, "GetUserMedia");
 
     // Specific flag to enable ImageCapture API.
     // TODO(mcasas): remove after https://crbug.com/603328 is closed.
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kEnableBlinkFeatures, "ImageCapture");
   }
 
+  void SetUp() override {
+    ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
+    WebRtcWebcamBrowserTest::SetUp();
+  }
+
+  // Tries to run a |command| JS test, returning true if the test can be safely
+  // skipped or it works as intended, or false otherwise.
+  bool RunImageCaptureTestCase(const std::string& command) {
+#if defined(OS_ANDROID)
+    // TODO(mcasas): fails on Lollipop devices: https://crbug.com/634811
+    if (base::android::BuildInfo::GetInstance()->sdk_int() <
+        base::android::SDK_VERSION_MARSHMALLOW) {
+      return true;
+    }
+#endif
+
+    GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile));
+    NavigateToURL(shell(), url);
+
+    if (!IsWebcamAvailableOnSystem(shell()->web_contents())) {
+      DVLOG(1) << "No video device; skipping test...";
+      return true;
+    }
+
+    std::string result;
+    if (!ExecuteScriptAndExtractString(shell(), command, &result))
+      return false;
+    return result == "OK";
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcImageCaptureBrowserTest);
 };
 
-#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) {
-#if defined(OS_ANDROID)
-  // TODO(mcasas): fails on Lollipop devices: https://crbug.com/634811
-  if (base::android::BuildInfo::GetInstance()->sdk_int() <
-      base::android::SDK_VERSION_MARSHMALLOW) {
-    return;
-  }
-#endif
-
-  ASSERT_TRUE(embedded_test_server()->Start());
-  GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile));
-  NavigateToURL(shell(), url);
-
-  if (!IsWebcamAvailableOnSystem(shell()->web_contents())) {
-    DVLOG(1) << "No video device; skipping test...";
-    return;
-  }
-
-  std::string result;
-  ASSERT_TRUE(ExecuteScriptAndExtractString(
-      shell(), "testCreateAndGetCapabilities()", &result));
-  if (result == "OK")
-    return;
-  FAIL();
+  embedded_test_server()->StartAcceptingConnections();
+  ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGetCapabilities()"));
 }
 
-#if defined(OS_WIN)
-// This test is flaky on WebRTC Windows bots: https://crbug.com/633242.
-#define MAYBE_CreateAndTakePhoto DISABLED_CreateAndTakePhoto
-#else
-#define MAYBE_CreateAndTakePhoto CreateAndTakePhoto
-#endif
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
                        MAYBE_CreateAndTakePhoto) {
-#if defined(OS_ANDROID)
-  // TODO(mcasas): fails on Lollipop devices: https://crbug.com/634811
-  if (base::android::BuildInfo::GetInstance()->sdk_int() <
-      base::android::SDK_VERSION_MARSHMALLOW) {
-    return;
-  }
-#endif
+  embedded_test_server()->StartAcceptingConnections();
+  ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndTakePhoto()"));
+}
 
-  ASSERT_TRUE(embedded_test_server()->Start());
-  GURL url(embedded_test_server()->GetURL(kImageCaptureHtmlFile));
-  NavigateToURL(shell(), url);
-
-  if (!IsWebcamAvailableOnSystem(shell()->web_contents())) {
-    DVLOG(1) << "No video device; skipping test...";
-    return;
-  }
-
-  std::string result;
-  ASSERT_TRUE(ExecuteScriptAndExtractString(shell(), "testCreateAndTakePhoto()",
-                                            &result));
-  if (result == "OK")
-    return;
-  FAIL();
+IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
+                       MAYBE_CreateAndGrabFrame) {
+  embedded_test_server()->StartAcceptingConnections();
+  ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGrabFrame()"));
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcImageCaptureBrowserTest,
                         testing::ValuesIn(kTestParameters));
 
 }  // namespace content