Media permissions: Remove plumbing for insecure pepper requests in Chrome

chrome/browser/media/media_stream_devices_controller.cc

 // Copyright (c) 2012 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 "chrome/browser/media/media_stream_devices_controller.h"
 
 #include <map>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 445 matching lines @@
              ->GetMediaStreamCaptureIndicator()
              ->RegisterMediaStream(web_contents_, devices);
   }
   base::ResetAndReturn(&callback_).Run(devices, request_result, std::move(ui));
 }
 
 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)) {
-      HostContentSettingsMapFactory::GetForProfile(profile_)
-          ->SetContentSettingDefaultScope(request_.security_origin, GURL(),
-                                          CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
-                                          std::string(), new_audio_setting);
-    }
+    HostContentSettingsMapFactory::GetForProfile(profile_)
+        ->SetContentSettingDefaultScope(request_.security_origin, GURL(),
+                                        CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+                                        std::string(), new_audio_setting);
   }
   if (IsAskingForVideo() && new_video_setting != CONTENT_SETTING_ASK) {
-    if (ShouldPersistContentSetting(new_video_setting, request_.security_origin,
-                                    is_pepper_request)) {
-      HostContentSettingsMapFactory::GetForProfile(profile_)
-          ->SetContentSettingDefaultScope(
-              request_.security_origin, GURL(),
-              CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(),
-              new_video_setting);
-    }
+    HostContentSettingsMapFactory::GetForProfile(profile_)
+        ->SetContentSettingDefaultScope(
+            request_.security_origin, GURL(),
+            CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(),
+            new_video_setting);
   }
 }
 
 void MediaStreamDevicesController::UpdateTabSpecificContentSettings(
     ContentSetting audio_setting,
     ContentSetting video_setting) const {
   if (!content_settings_)
     return;
 
   TabSpecificContentSettings::MicrophoneCameraState microphone_camera_state =
@@ skipping 56 matching lines @@
 
   content::PermissionType permission_type;
   if (content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
     permission_type = content::PermissionType::AUDIO_CAPTURE;
   } else {
     DCHECK(content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
     permission_type = content::PermissionType::VIDEO_CAPTURE;
   }
 
   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);
   }
   // Return the default content setting if the device is not requested.
   return CONTENT_SETTING_DEFAULT;
 }
 
 ContentSetting MediaStreamDevicesController::GetNewSetting(
     ContentSettingsType content_type,
@@ skipping 36 matching lines @@
   if (android_permission_blocked)
     return false;
 
   // Don't approve device requests if the tab was hidden.
   // TODO(qinmin): Add a test for this. http://crbug.com/396869.
   // TODO(raymes): Shouldn't this apply to all permissions not just audio/video?
   return web_contents_->GetRenderWidgetHostView()->IsShowing();
 #endif
   return true;
 }