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

chrome/browser/media/webrtc_browsertest_base.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_BROWSERTEST_BASE_H_
 #define CHROME_BROWSER_MEDIA_WEBRTC_BROWSERTEST_BASE_H_
 
 #include <string>
 
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 28 matching lines @@
   static const char kFailedWithPermissionDismissedError[];
 
  protected:
   WebRtcTestBase();
   ~WebRtcTestBase() override;
 
   // These all require that the loaded page fulfills the public interface in
   // chrome/test/data/webrtc/getusermedia.js.
   // If an error is reported back from the getUserMedia call, these functions
   // will return false.
+  // The ...AndAccept()/...AndDeny()/...AndDismiss() functions expect that a
+  // prompt will be shown (i.e. the current origin in the tab_contents doesn't
+  // have a saved permission).
   bool GetUserMediaAndAccept(content::WebContents* tab_contents) const;
   bool GetUserMediaWithSpecificConstraintsAndAccept(
       content::WebContents* tab_contents,
       const std::string& constraints) const;
+  bool GetUserMediaWithSpecificConstraintsAndAcceptIfPrompted(
+      content::WebContents* tab_contents,
+      const std::string& constraints) const;
   void GetUserMediaAndDeny(content::WebContents* tab_contents);
   void GetUserMediaWithSpecificConstraintsAndDeny(
       content::WebContents* tab_contents,
       const std::string& constraints) const;
   void GetUserMediaAndDismiss(content::WebContents* tab_contents) const;
+  void GetUserMediaAndExpectAutoAcceptWithoutPrompt(
+      content::WebContents* tab_contents) const;
+  void GetUserMediaAndExpectAutoDenyWithoutPrompt(
+      content::WebContents* tab_contents) const;
   void GetUserMedia(content::WebContents* tab_contents,
                     const std::string& constraints) const;
 
   // Convenience method which opens the page at url, calls GetUserMediaAndAccept
   // and returns the new tab.
   content::WebContents* OpenPageAndGetUserMediaInNewTab(const GURL& url) const;
 
   // Convenience method which opens the page at url, calls
   // GetUserMediaAndAcceptWithSpecificConstraints and returns the new tab.
   content::WebContents* OpenPageAndGetUserMediaInNewTabWithConstraints(
@@ skipping 70 matching lines @@
   infobars::InfoBar* GetUserMediaAndWaitForInfoBar(
       content::WebContents* tab_contents,
       const std::string& constraints) const;
 
   bool detect_errors_in_javascript_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRtcTestBase);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_WEBRTC_BROWSERTEST_BASE_H_