Media permissions: Remove plumbing for insecure pepper requests in Chrome

chrome/browser/media/permission_bubble_media_access_handler.cc

 // Copyright 2015 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/permission_bubble_media_access_handler.h"
 
 #include <utility>
 
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/media/media_permission.h"
@@ skipping 74 matching lines @@
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type,
     const extensions::Extension* extension) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   ContentSettingsType content_settings_type =
       type == content::MEDIA_DEVICE_AUDIO_CAPTURE
           ? CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
           : CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
-  // TODO(raymes): This function may be called for a media request coming from
-  // Flash or from WebRTC. However, whether or not this is a request for Flash,
-  // in which case we would use MEDIA_OPEN_DEVICE_PEPPER_ONLY, isn't plumbed
-  // through. Fortunately, post M47, WebRTC requests can't be made from HTTP so
-  // we can assume all HTTP requests are for Flash for the purpose of the
-  // permission check. This special case should be removed after HTTP access for
-  // Flash has been deprecated (crbug.com/526324). See crbug.com/547654 for more
-  // details.
-  bool is_insecure_pepper_request = security_origin.SchemeIs(url::kHttpScheme);
 
-  MediaPermission permission(
-      content_settings_type, is_insecure_pepper_request, security_origin,
+  MediaPermission permission(content_settings_type, security_origin,
       web_contents->GetLastCommittedURL().GetOrigin(), profile);
   content::MediaStreamRequestResult unused;
   return permission.GetPermissionStatus(&unused) == CONTENT_SETTING_ALLOW;
 }
 
 void PermissionBubbleMediaAccessHandler::HandleRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback,
     const extensions::Extension* extension) {
@@ skipping 130 matching lines @@
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     content::WebContents* web_contents =
         content::Source<content::WebContents>(source).ptr();
     pending_requests_.erase(web_contents);
   }
 }