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

chrome/browser/media/webrtc_browsertest_base.h

Index: chrome/browser/media/webrtc_browsertest_base.h
diff --git a/chrome/browser/media/webrtc_browsertest_base.h b/chrome/browser/media/webrtc_browsertest_base.h
index 9cc092923d70bd74b74c590b11c1e4726562f9c6..493807bce6d232e4bf2fe1a280ed488e23fae5fa 100644
--- a/chrome/browser/media/webrtc_browsertest_base.h
+++ b/chrome/browser/media/webrtc_browsertest_base.h
@@ -46,15 +46,25 @@ class WebRtcTestBase : public InProcessBrowserTest {
   // 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;