Media permissions: Remove plumbing for insecure pepper requests in Chrome

chrome/browser/media/media_stream_devices_controller.cc

Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 26d411d7fb394de870e181d1dd35ac3cc146341b..82107803b93abab6e0bc028530543f0a918776ad 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -463,13 +463,11 @@ void MediaStreamDevicesController::StorePermission(
     ContentSetting new_audio_setting,
     ContentSetting new_video_setting) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
-  bool is_pepper_request =
-      request_.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY;
+  DCHECK(content::IsOriginSecure(request_.security_origin) ||
+         request_.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY);
 
   if (IsAskingForAudio() && new_audio_setting != CONTENT_SETTING_ASK) {
-    if (ShouldPersistContentSetting(new_audio_setting, request_.security_origin,
-                                    is_pepper_request)) {
+    if (ShouldPersistContentSetting(request_.security_origin)) {
       HostContentSettingsMapFactory::GetForProfile(profile_)
           ->SetContentSettingDefaultScope(request_.security_origin, GURL(),
                                           CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
@@ -477,8 +475,7 @@ void MediaStreamDevicesController::StorePermission(
     }
   }
   if (IsAskingForVideo() && new_video_setting != CONTENT_SETTING_ASK) {
-    if (ShouldPersistContentSetting(new_video_setting, request_.security_origin,
-                                    is_pepper_request)) {
+    if (ShouldPersistContentSetting(request_.security_origin)) {
       HostContentSettingsMapFactory::GetForProfile(profile_)
           ->SetContentSettingDefaultScope(
               request_.security_origin, GURL(),
@@ -561,11 +558,9 @@ ContentSetting MediaStreamDevicesController::GetContentSetting(
   }
 
   if (ContentTypeIsRequested(permission_type, request)) {
-    bool is_insecure_pepper_request =
-        request.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY &&
-        request.security_origin.SchemeIs(url::kHttpScheme);
-    MediaPermission permission(
-        content_type, is_insecure_pepper_request, request.security_origin,
+    DCHECK(content::IsOriginSecure(request_.security_origin) ||
+           request_.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY);
+    MediaPermission permission(content_type, request.security_origin,
         web_contents_->GetLastCommittedURL().GetOrigin(), profile_);
     return permission.GetPermissionStatusWithDeviceRequired(requested_device_id,
                                                             denial_reason);