Refactor media permission dispatcher class and create proxy class for non-UI threads.

content/renderer/media/media_permission_dispatcher.cc

Index: content/renderer/media/media_permission_dispatcher.cc
diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc
index ad2c825506252f3d3dc5f6408e1ecfa26c57e962..80891c562e2fa60e564973dbfa39f66e4cabe893 100644
--- a/content/renderer/media/media_permission_dispatcher.cc
+++ b/content/renderer/media/media_permission_dispatcher.cc
@@ -4,41 +4,13 @@
 
 #include "content/renderer/media/media_permission_dispatcher.h"
 
-#include "base/bind.h"
 #include "base/logging.h"
-#include "content/public/common/service_registry.h"
-#include "content/public/renderer/render_frame.h"
-#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
-#include "url/gurl.h"
-
-namespace {
-
-using Type = media::MediaPermission::Type;
-
-content::PermissionName MediaPermissionTypeToPermissionName(Type type) {
-  switch (type) {
-    case Type::PROTECTED_MEDIA_IDENTIFIER:
-      return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER;
-    case Type::AUDIO_CAPTURE:
-      return content::PERMISSION_NAME_AUDIO_CAPTURE;
-    case Type::VIDEO_CAPTURE:
-      return content::PERMISSION_NAME_VIDEO_CAPTURE;
-  }
-  NOTREACHED();
-  return content::PERMISSION_NAME_PROTECTED_MEDIA_IDENTIFIER;
-}
-
-}  // namespace
 
 namespace content {
 
-MediaPermissionDispatcher::MediaPermissionDispatcher(RenderFrame* render_frame)
-    : RenderFrameObserver(render_frame), next_request_id_(0) {
-}
+MediaPermissionDispatcher::MediaPermissionDispatcher() : next_request_id_(0) {}
 
 MediaPermissionDispatcher::~MediaPermissionDispatcher() {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
   // Fire all pending callbacks with |false|.
   for (auto& request : requests_)
     request.second.Run(false);
@@ -46,57 +18,17 @@ MediaPermissionDispatcher::~MediaPermissionDispatcher() {
   requests_.clear();
 }
 
-void MediaPermissionDispatcher::HasPermission(
-    Type type,
-    const GURL& security_origin,
-    const PermissionStatusCB& permission_status_cb) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  if (!permission_service_.get()) {
-    render_frame()->GetServiceRegistry()->ConnectToRemoteService(
-        mojo::GetProxy(&permission_service_));
-  }
-
-  uint32_t request_id = next_request_id_++;
-  DCHECK(!requests_.count(request_id));
-  requests_[request_id] = permission_status_cb;
-
-  DVLOG(2) << __FUNCTION__ << ": request ID " << request_id;
-
-  permission_service_->HasPermission(
-      MediaPermissionTypeToPermissionName(type), security_origin.spec(),
-      base::Bind(&MediaPermissionDispatcher::OnPermissionStatus,
-                 base::Unretained(this), request_id));
-}
-
-void MediaPermissionDispatcher::RequestPermission(
-    Type type,
-    const GURL& security_origin,
+uint32_t MediaPermissionDispatcher::RegisterCallback(
     const PermissionStatusCB& permission_status_cb) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  if (!permission_service_.get()) {
-    render_frame()->GetServiceRegistry()->ConnectToRemoteService(
-        mojo::GetProxy(&permission_service_));
-  }
-
   uint32_t request_id = next_request_id_++;
   DCHECK(!requests_.count(request_id));
   requests_[request_id] = permission_status_cb;
-
-  DVLOG(2) << __FUNCTION__ << ": request ID " << request_id;
-
-  permission_service_->RequestPermission(
-      MediaPermissionTypeToPermissionName(type), security_origin.spec(),
-      blink::WebUserGestureIndicator::isProcessingUserGesture(),
-      base::Bind(&MediaPermissionDispatcher::OnPermissionStatus,
-                 base::Unretained(this), request_id));
+  return request_id;
 }
 
-void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id,
-                                                   PermissionStatus status) {
-  DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << status << ")";
-  DCHECK(thread_checker_.CalledOnValidThread());
+void MediaPermissionDispatcher::DeliverResult(uint32_t request_id,
+                                              bool granted) {
+  DVLOG(2) << __FUNCTION__ << ": (" << request_id << ", " << granted << ")";
 
   RequestMap::iterator iter = requests_.find(request_id);
   if (iter == requests_.end()) {
@@ -107,7 +39,7 @@ void MediaPermissionDispatcher::OnPermissionStatus(uint32_t request_id,
   PermissionStatusCB permission_status_cb = iter->second;
   requests_.erase(iter);
 
-  permission_status_cb.Run(status == PERMISSION_STATUS_GRANTED);
+  permission_status_cb.Run(granted);
 }
 
 }  // namespace content