Only store per-navigation permissions for http requests and not https.

Doing so caused us to ignore stored content settings for pages accessed via https if a page had been accessed, settings changed and then the page accessed again.

BUG=374393
R=xians@chromium.org

Review URL: https://codereview.chromium.org/304183006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273853 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/media/media_stream_devices_controller.cc

@@ -410,13 +410,16 @@ void MediaStreamDevicesController::Accept(bool update_content_setting) {
                                           &devices);
         }
 
-        // Tag this navigation entry with the granted permissions.
-        // This avoids repeated prompts for requests accessed via http.
-        content::NavigationEntry* navigation_entry =
-            web_contents_->GetController().GetVisibleEntry();
-        if (navigation_entry) {
-          SetMediaPermissionsForNavigationEntry(
-              navigation_entry, request_, audio_allowed, video_allowed);
+        // For pages accessed via http (not https), tag this navigation entry
+        // with the granted permissions.  This avoids repeated prompts for
+        // device access.
+        if (!IsSchemeSecure()) {
+          content::NavigationEntry* navigation_entry =
+              web_contents_->GetController().GetVisibleEntry();
+          if (navigation_entry) {
+            SetMediaPermissionsForNavigationEntry(
+                navigation_entry, request_, audio_allowed, video_allowed);
+          }
         }
         break;
       }