Image Capture: enable content_browsertests in Linux/CrOs

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"
@@ skipping 21 matching lines @@
 #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/656810
 static struct TargetCamera {
   bool use_fake;
-} const kTestParameters[] = {{true}};
+} const kTestParameters[] = {
+#if !defined(OS_LINUX)
+    {true}
+#else
+    {true},
+    {false}
+#endif
+};

[xianglu, 2016/10/28 16:33:54]

Consider:
{
    {true},
#if !defined(OS_LINUX)
#else
    {false},
#endif
}
I think with the comma, if we need to modify this list in the future we only
need to change one line.

[mcasas, 2016/10/28 17:00:49]

I'm always wondering if some compilers would not
have issues with trailing commas after the last
element of an initializer lists, we'll see the bots,
otherwise done.

 
 }  // 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:
@@ skipping 40 matching lines @@
     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;
+    DLOG_IF(ERROR, result != "OK") << result;
     return result == "OK";
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcImageCaptureBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest, MAYBE_GetCapabilities) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndGetCapabilities()"));
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcImageCaptureBrowserTest, MAYBE_TakePhoto) {
   embedded_test_server()->StartAcceptingConnections();
   ASSERT_TRUE(RunImageCaptureTestCase("testCreateAndTakePhoto()"));
 }
 
 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