Refactor Permissions related method out of ContentBrowserClient.

content/browser/permissions/permission_service_impl.cc

 // Copyright 2014 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 "content/browser/permissions/permission_service_impl.h"
 
-#include "content/public/browser/content_browser_client.h"
+#include "base/bind.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 
 namespace content {
 
 namespace {
 
 PermissionType PermissionNameToPermissionType(PermissionName name) {
   switch(name) {
     case PERMISSION_NAME_GEOLOCATION:
       return PermissionType::GEOLOCATION;
@@ skipping 53 matching lines @@
   // can. Even if the call comes from a context where it is not possible to show
   // any UI, we want to still return something relevant so the current
   // permission status is returned.
   if (!context_->web_contents()) {
     // There is no way to show a UI so the call will simply return the current
     // permission.
     HasPermission(permission, origin, callback);
     return;
   }
 
+  BrowserContext* browser_context = context_->GetBrowserContext();
+  DCHECK(browser_context);
+  if (!browser_context->GetPermissionManager()) {
+    callback.Run(content::PERMISSION_STATUS_DENIED);
+    return;
+  }
+
   PermissionType permission_type = PermissionNameToPermissionType(permission);
   int request_id = pending_requests_.Add(
       new PendingRequest(permission_type, GURL(origin), callback));
 
-  GetContentClient()->browser()->RequestPermission(
+  browser_context->GetPermissionManager()->RequestPermission(
       permission_type,
       context_->web_contents(),
       request_id,
       GURL(origin),
       user_gesture, // TODO(mlamouri): should be removed (crbug.com/423770)
       base::Bind(&PermissionServiceImpl::OnRequestPermissionResponse,
                  weak_factory_.GetWeakPtr(),
                  request_id));
 }
 
 void PermissionServiceImpl::OnRequestPermissionResponse(
     int request_id,
     PermissionStatus status) {
   PendingRequest* request = pending_requests_.Lookup(request_id);
   mojo::Callback<void(PermissionStatus)> callback(request->callback);
   request->callback.reset();
   pending_requests_.Remove(request_id);
   callback.Run(status);
 }
 
 void PermissionServiceImpl::CancelPendingRequests() {
   DCHECK(context_->web_contents());
+  DCHECK(context_->GetBrowserContext());
+
+  PermissionManager* permission_manager =
+      context_->GetBrowserContext()->GetPermissionManager();
+  if (!permission_manager)
+    return;
 
   for (RequestsMap::Iterator<PendingRequest> it(&pending_requests_);
        !it.IsAtEnd(); it.Advance()) {
-    GetContentClient()->browser()->CancelPermissionRequest(
+    permission_manager->CancelPermissionRequest(
         it.GetCurrentValue()->permission,
         context_->web_contents(),
         it.GetCurrentKey(),
         it.GetCurrentValue()->origin);
   }
 
   pending_requests_.Clear();
 }
 
 void PermissionServiceImpl::HasPermission(
@@ skipping 21 matching lines @@
     return;
   }
 
   ResetPermissionStatus(permission_type, origin_url);
 
   callback.Run(GetPermissionStatus(permission_type, origin_url));
 }
 
 PermissionStatus PermissionServiceImpl::GetPermissionStatus(PermissionType type,
                                                             GURL origin) {
+  BrowserContext* browser_context = context_->GetBrowserContext();
+  DCHECK(browser_context);
+  if (!browser_context->GetPermissionManager())
+    return content::PERMISSION_STATUS_DENIED;
+
   // If the embedding_origin is empty we'll use |origin| instead.
   GURL embedding_origin = context_->GetEmbeddingOrigin();
-  return GetContentClient()->browser()->GetPermissionStatus(
-      type, context_->GetBrowserContext(), origin,
-      embedding_origin.is_empty() ? origin : embedding_origin);
+  return browser_context->GetPermissionManager()->GetPermissionStatus(
+      type, origin, embedding_origin.is_empty() ? origin : embedding_origin);
 }
 
 void PermissionServiceImpl::ResetPermissionStatus(PermissionType type,
                                                   GURL origin) {
+  BrowserContext* browser_context = context_->GetBrowserContext();
+  DCHECK(browser_context);
+  if (!browser_context->GetPermissionManager())
+    return;
+
   // If the embedding_origin is empty we'll use |origin| instead.
   GURL embedding_origin = context_->GetEmbeddingOrigin();
-  GetContentClient()->browser()->ResetPermission(
-      type, context_->GetBrowserContext(), origin,
-      embedding_origin.is_empty() ? origin : embedding_origin);
+  browser_context->GetPermissionManager()->ResetPermission(
+      type, origin, embedding_origin.is_empty() ? origin : embedding_origin);
 }
 
 }  // namespace content