Improve Mojo permission service and chrome::PermissionManager observing.

content/browser/permissions/permission_service_context.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_context.h"
 
 #include "content/browser/permissions/permission_service_impl.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 29 matching lines @@
 
 void PermissionServiceContext::ServiceHadConnectionError(
     PermissionServiceImpl* service) {
   auto it = std::find(services_.begin(), services_.end(), service);
   DCHECK(it != services_.end());
   services_.erase(it);
 }
 
 void PermissionServiceContext::RenderFrameDeleted(
     RenderFrameHost* render_frame_host) {
-  CancelPendingRequests(render_frame_host);
+  CancelPendingOperations(render_frame_host);
 }
 
 void PermissionServiceContext::DidNavigateAnyFrame(
     RenderFrameHost* render_frame_host,
     const LoadCommittedDetails& details,
     const FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
 
-  CancelPendingRequests(render_frame_host);
+  CancelPendingOperations(render_frame_host);
 }
 
-void PermissionServiceContext::CancelPendingRequests(
+void PermissionServiceContext::CancelPendingOperations(
     RenderFrameHost* render_frame_host) const {
   if (render_frame_host != render_frame_host_)
     return;
 
   for (auto* service : services_)
-    service->CancelPendingRequests();
+    service->CancelPendingOperations();
 }
 
 BrowserContext* PermissionServiceContext::GetBrowserContext() const {
   if (!web_contents()) {
     DCHECK(render_process_host_);
     return render_process_host_->GetBrowserContext();
   }
   return web_contents()->GetBrowserContext();
 }
 
 GURL PermissionServiceContext::GetEmbeddingOrigin() const {
   return web_contents() ? web_contents()->GetLastCommittedURL().GetOrigin()
                         : GURL();
 }
 
 } // namespace content