Media permissions: Remove plumbing for insecure pepper requests in Chrome

chrome/browser/media/media_stream_device_permissions.cc

Index: chrome/browser/media/media_stream_device_permissions.cc
diff --git a/chrome/browser/media/media_stream_device_permissions.cc b/chrome/browser/media/media_stream_device_permissions.cc
index 6f01fa4f4d5e83246ba8b81daca1c172a4119e6f..3e961bb27ab6f8e988e2d19e1e500d93d381990a 100644
--- a/chrome/browser/media/media_stream_device_permissions.cc
+++ b/chrome/browser/media/media_stream_device_permissions.cc
@@ -16,27 +16,9 @@
 #include "extensions/common/constants.h"
 #include "url/gurl.h"
 
-bool ShouldPersistContentSetting(ContentSetting setting,
-                                 const GURL& origin,
-                                 bool is_pepper_request) {
+bool ShouldPersistContentSetting(const GURL& origin) {
   // When the request is from an invalid scheme we don't persist it.
-  if (!ContentSettingsPattern::FromURLNoWildcard(origin).IsValid())
-    return false;
-
-  // It's safe to persist block settings all the time.
-  if (setting == CONTENT_SETTING_BLOCK)
-    return true;
-
-  // Pepper requests should always be persisted to prevent annoying users of
-  // plugins.
-  if (is_pepper_request)
-    return true;
-
-  // We persist requests from secure origins.
-  if (content::IsOriginSecure(origin))
-    return true;
-
-  return false;
+  return ContentSettingsPattern::FromURLNoWildcard(origin).IsValid();
 }
 
 MediaStreamDevicePolicy GetDevicePolicy(const Profile* profile,