Remove origins from media::MediaPermission

Bug: 793684
Change-Id: I80f656d0ceaeab0687002ecf8448c99ea4427f90
Reviewed-on: https://chromium-review.googlesource.com/822310Reviewed-by: Dan Sanders <sandersd@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523861}

content/renderer/media/media_permission_dispatcher.cc

@@ -68,17 +68,14 @@ void MediaPermissionDispatcher::OnNavigation() {
   OnConnectionError();
 }
 
-// TODO(crbug.com/793684): |security_origin| is no longer used; remove it.
 void MediaPermissionDispatcher::HasPermission(
     Type type,
-    const GURL& security_origin,
     const PermissionStatusCB& permission_status_cb) {
   if (!task_runner_->RunsTasksInCurrentSequence()) {
     task_runner_->PostTask(
         FROM_HERE,
         base::BindOnce(&MediaPermissionDispatcher::HasPermission, weak_ptr_,
-                       type, security_origin,
-                       media::BindToCurrentLoop(permission_status_cb)));
+                       type, media::BindToCurrentLoop(permission_status_cb)));
     return;
   }
 
@@ -93,17 +90,14 @@ void MediaPermissionDispatcher::HasPermission(
                      request_id));
 }
 
-// TODO(crbug.com/793684): |security_origin| is no longer used; remove it.
 void MediaPermissionDispatcher::RequestPermission(
     Type type,
-    const GURL& security_origin,
     const PermissionStatusCB& permission_status_cb) {
   if (!task_runner_->RunsTasksInCurrentSequence()) {
     task_runner_->PostTask(
         FROM_HERE,
         base::BindOnce(&MediaPermissionDispatcher::RequestPermission, weak_ptr_,
-                       type, security_origin,
-                       media::BindToCurrentLoop(permission_status_cb)));
+                       type, media::BindToCurrentLoop(permission_status_cb)));
     return;
   }
 

content/renderer/media/media_permission_dispatcher.h

@@ -42,11 +42,9 @@ class CONTENT_EXPORT MediaPermissionDispatcher : public media::MediaPermission {
   // Note: Can be called on any thread. The |permission_status_cb| will always
   // be fired on the thread where these methods are called.
   void HasPermission(Type type,
-                     const GURL& security_origin,
                      const PermissionStatusCB& permission_status_cb) override;
   void RequestPermission(
       Type type,
-      const GURL& security_origin,
       const PermissionStatusCB& permission_status_cb) override;
   bool IsEncryptedMediaEnabled() override;
 

content/renderer/p2p/filtering_network_manager.cc

@@ -101,10 +101,10 @@ void FilteringNetworkManager::CheckPermission() {
   VLOG(1) << "FilteringNetworkManager checking permission status.";
   // Request for media permission asynchronously.
   media_permission_->HasPermission(
-      media::MediaPermission::AUDIO_CAPTURE, requesting_origin_,
+      media::MediaPermission::AUDIO_CAPTURE,
       base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
   media_permission_->HasPermission(
-      media::MediaPermission::VIDEO_CAPTURE, requesting_origin_,
+      media::MediaPermission::VIDEO_CAPTURE,
       base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
 }
 

content/renderer/p2p/filtering_network_manager_unittest.cc

@@ -82,13 +82,11 @@ class MockMediaPermission : public media::MediaPermission {
 
   void RequestPermission(
       Type type,
-      const GURL& security_origin,
       const PermissionStatusCB& permission_status_cb) override {
     NOTIMPLEMENTED();
   }
 
   void HasPermission(Type type,
-                     const GURL& security_origin,
                      const PermissionStatusCB& permission_status_cb) override {
     if (type == MediaPermission::AUDIO_CAPTURE) {
       DCHECK(mic_callback_.is_null());

media/base/media_permission.h

@@ -9,8 +9,6 @@
 #include "base/macros.h"
 #include "media/base/media_export.h"
 
-class GURL;
-
 namespace media {
 
 // Interface to handle media related permission checks and requests.
@@ -32,14 +30,12 @@ class MEDIA_EXPORT MediaPermission {
   // |false| if the permission has never been set.
   virtual void HasPermission(
       Type type,
-      const GURL& security_origin,
       const PermissionStatusCB& permission_status_cb) = 0;
 
   // Requests |type| permission for |security_origion|. This may trigger user
   // interaction (e.g. permission prompt) if the permission has never been set.
   virtual void RequestPermission(
       Type type,
-      const GURL& security_origin,
       const PermissionStatusCB& permission_status_cb) = 0;
 
   // Whether to allow the use of Encrypted Media Extensions (EME), except for

media/blink/key_system_config_selector.cc

@@ -942,7 +942,7 @@ void KeySystemConfigSelector::SelectConfigInternal(
           GURL security_origin(url::Origin(request->security_origin).GetURL());
           DVLOG(3) << "Request permission.";
           media_permission_->RequestPermission(
-              MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin,
+              MediaPermission::PROTECTED_MEDIA_IDENTIFIER,
               base::Bind(&KeySystemConfigSelector::OnPermissionResult,
                          weak_factory_.GetWeakPtr(), base::Passed(&request)));
         }

media/blink/key_system_config_selector_unittest.cc

@@ -197,14 +197,12 @@ class FakeMediaPermission : public MediaPermission {
  public:
   // MediaPermission implementation.
   void HasPermission(Type type,
-                     const GURL& security_origin,
                      const PermissionStatusCB& permission_status_cb) override {
     permission_status_cb.Run(is_granted);
   }
 
   void RequestPermission(
       Type type,
-      const GURL& security_origin,
       const PermissionStatusCB& permission_status_cb) override {
     requests++;
     permission_status_cb.Run(is_granted);