Switch media stream permissions to use IsOriginSecure() instead of SchemeIsSecure().

chrome/browser/media/chrome_webrtc_webcam_browsertest.cc

 // Copyright 2014 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 "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 38 matching lines @@
   }
 
  protected:
   void SetUpInProcessBrowserTestFixture() override {
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
   std::string GetUserMediaAndGetStreamSize(content::WebContents* tab,
                                            const std::string& constraints) {
     std::string actual_stream_size;
-    if (GetUserMediaWithSpecificConstraintsAndAccept(tab, constraints)) {
+    if (GetUserMediaWithSpecificConstraintsAndAcceptIfPrompted(tab, constraints)) {

[tommi (sloooow) - chröme, 2015/08/13 13:03:17]

is this still within 80? (just checking)

[lgarron, 2015/08/13 20:30:01]

Good catch!
It seems I forgot to run `git cl format`. :-(

       StartDetectingVideo(tab, "local-view");
       if (WaitForVideoToPlay(tab))
         actual_stream_size = GetStreamSize(tab, "local-view");
       CloseLastLocalStream(tab);
     }
     return actual_stream_size;
   }
 
   bool IsOnQtKit() const {
 #if defined(OS_MACOSX)
@@ skipping 35 matching lines @@
 
   EXPECT_EQ("1280x720",
             GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints720p));
   EXPECT_EQ("1920x1080",
             GetUserMediaAndGetStreamSize(tab, kVideoCallConstraints1080p));
 }
 
 INSTANTIATE_TEST_CASE_P(WebRtcWebcamBrowserTests,
                         WebRtcWebcamBrowserTest,
                         testing::ValuesIn(kTestConfigFlags));