ImageCapture browser tests: use IsWebcamAvailableOnSystem()

content/public/test/browser_test_utils.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/public/test/browser_test_utils.h"
 
 #include <stddef.h>
 #include <tuple>
 #include <utility>
 
@@ skipping 400 matching lines @@
 // Queries for video input devices on the current system using the getSources
 // API.
 //
 // This does not guarantee that a getUserMedia with video will succeed, as the
 // camera could be busy for instance.
 //
 // Returns has-video-input-device to the test if there is a webcam available,
 // no-video-input-devices otherwise.
 const char kHasVideoInputDeviceOnSystem[] =
     "(function() {"
-    "navigator.mediaDevices.enumerateDevices()"
-    ".then(function(devices) {"
-    "devices.forEach(function(device) {"
-    "if (device.kind == 'video') {"
-    "returnToTest('has-video-input-device');"
-    "return;"
-    "}"
-    "});"
-    "returnToTest('no-video-input-devices');"
-    "});"
+    "  navigator.mediaDevices.enumerateDevices()"

[lunalu1, 2016/09/16 16:56:22]

We can revert these changes now since these have been done in another CL
https://codereview.chromium.org/2334223012/

[mcasas, 2016/09/19 22:42:17]

Done: PS2 doesn't touch this file anymore.

+    "    .then((devices) => {"
+    "      devices.forEach(function(device) {"
+    "        if (device.kind == 'videoinput') {"
+    "          window.domAutomationController.send('has-video-input-device');"
+    "          return;"
+    "        }"
+    "      });"
+    "      window.domAutomationController.send('no-video-input-devices');"
+    "   });"
     "})()";
 
 const char kHasVideoInputDevice[] = "has-video-input-device";
 
 }  // namespace
 
 bool NavigateIframeToURL(WebContents* web_contents,
                          std::string iframe_id,
                          const GURL& url) {
   std::string script = base::StringPrintf(
@@ skipping 1279 matching lines @@
 
 bool TestNavigationManager::ShouldMonitorNavigation(NavigationHandle* handle) {
   if (handle_ || handle->GetURL() != url_)
     return false;
   if (handled_navigation_)
     return false;
   return true;
 }
 
 }  // namespace content