Media permissions: Remove plumbing for insecure pepper requests in Chrome

chrome/browser/media/media_stream_device_permission_context.cc

Index: chrome/browser/media/media_stream_device_permission_context.cc
diff --git a/chrome/browser/media/media_stream_device_permission_context.cc b/chrome/browser/media/media_stream_device_permission_context.cc
index a6febf0091c06be9584b7ee0740e02615af57c51..3c244fda789ef6038a8cd5617574b2692b83907e 100644
--- a/chrome/browser/media/media_stream_device_permission_context.cc
+++ b/chrome/browser/media/media_stream_device_permission_context.cc
@@ -35,15 +35,7 @@ void MediaStreamDevicePermissionContext::RequestPermission(
 ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatus(
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
-  return GetPermissionStatusInternal(requesting_origin, embedding_origin,
-                                     false);
-}
-
-ContentSetting MediaStreamDevicePermissionContext::
-    GetPermissionStatusAllowingInsecureForPepper(
-        const GURL& requesting_origin,
-        const GURL& embedding_origin) const {
-  return GetPermissionStatusInternal(requesting_origin, embedding_origin, true);
+  return GetPermissionStatusInternal(requesting_origin, embedding_origin);

[raymes, 2016/06/06 05:11:10]

nit: should we inline this now?

[tsergeant, 2016/06/06 07:19:33]

Done.

 }
 
 void MediaStreamDevicePermissionContext::ResetPermission(
@@ -60,8 +52,7 @@ void MediaStreamDevicePermissionContext::CancelPermissionRequest(
 
 ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
     const GURL& requesting_origin,
-    const GURL& embedding_origin,
-    bool is_pepper_request) const {
+    const GURL& embedding_origin) const {
   // TODO(raymes): Merge this policy check into content settings
   // crbug.com/244389.
   const char* policy_name = nullptr;
@@ -95,14 +86,7 @@ ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
   if (setting == CONTENT_SETTING_DEFAULT)
     setting = CONTENT_SETTING_ASK;
 
-  // TODO(raymes): This is here for safety to ensure that we always ask the user
-  // even if a content setting is set to "allow" if the origin is insecure. In
-  // reality we shouldn't really need to check this here as we should respect
-  // the user's content setting. The problem is that pepper requests allow
-  // insecure origins to be persisted. We should remove this after
-  // crbug.com/526324 is fixed.
-  if (!ShouldPersistContentSetting(setting, requesting_origin,
-                                   is_pepper_request) &&
+  if (!ShouldPersistContentSetting(requesting_origin) &&
       !requesting_origin.SchemeIs(extensions::kExtensionScheme) &&
       !requesting_origin.SchemeIs(content::kChromeUIScheme) &&
       !requesting_origin.SchemeIs(content::kChromeDevToolsScheme)) {