ImageCapture content_browsertests: bugfix flag passing

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
+#define MAYBE_GetCapabilities DISABLED_GetCapabilities
+#define MAYBE_TakePhoto DISABLED_TakePhoto
+#define MAYBE_GrabFrame DISABLED_GrabFrame
 #else
-#define MAYBE_CreateAndGetCapabilities CreateAndGetCapabilities
-#define MAYBE_CreateAndTakePhoto CreateAndTakePhoto
-#define MAYBE_CreateAndGrabFrame CreateAndGrabFrame
+#define MAYBE_GetCapabilities GetCapabilities
+#define MAYBE_TakePhoto TakePhoto
+#define MAYBE_GrabFrame GrabFrame
 #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.
+// platforms where the ImageCaptureCode is landed, https://crbug.com/656810
 static struct TargetCamera {
   bool use_fake;
 } const kTestParameters[] = {{true}};
 
 }  // namespace
 
 // 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;
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     WebRtcWebcamBrowserTest::SetUpCommandLine(command_line);
 
     ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kUseFakeDeviceForMediaStream));
     if (GetParam().use_fake) {
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kUseFakeDeviceForMediaStream);
       ASSERT_TRUE(base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUseFakeDeviceForMediaStream));
     }
 
-    // Enables promised-based navigator.mediaDevices.getUserMedia();
-    // TODO(mcasas): remove after https://crbug.com/503227 is closed.
+    // "GetUserMedia": enables navigator.mediaDevices.getUserMedia();
+    // TODO(mcasas): remove GetUserMedia after https://crbug.com/503227.
+    // "ImageCapture": enables the ImageCapture API.
+    // TODO(mcasas): remove ImageCapture after https://crbug.com/603328.
     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");
+        switches::kEnableBlinkFeatures, "GetUserMedia,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) {
@@ skipping 16 matching lines @@
     std::string result;
     if (!ExecuteScriptAndExtractString(shell(), command, &result))
       return false;
     return result == "OK";
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcImageCaptureBrowserTest);
 };
 
-IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
-                       MAYBE_CreateAndGetCapabilities) {
+IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest, MAYBE_GetCapabilities) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGetCapabilities()"));

[ncarter (slow), 2016/10/17 23:20:13]

Do you want to rename the js methods too?

[mcasas, 2016/10/17 23:22:05]

Nah, I like the test cases to be called after what
they test, but the JS methods after what they do,
so: not worth renaming them in this patch.

 }
 
-IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
-                       MAYBE_CreateAndTakePhoto) {
+IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest, MAYBE_TakePhoto) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndTakePhoto()"));
 }
 
-IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest,
-                       MAYBE_CreateAndGrabFrame) {
+IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest, MAYBE_GrabFrame) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGrabFrame()"));
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         WebRtcImageCaptureBrowserTest,
                         testing::ValuesIn(kTestParameters));
 
 }  // namespace content