Group the different permission related methods in the content api.

content/browser/geolocation/geolocation_dispatcher_host.cc

 // Copyright (c) 2012 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/geolocation/geolocation_dispatcher_host.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
@@ skipping 147 matching lines @@
   }
 }
 
 void GeolocationDispatcherHost::UpdateGeoposition(
     RenderFrameHost* frame,
     const Geoposition& geoposition) {
   RenderFrameHost* top_frame = frame;
   while (top_frame->GetParent()) {
     top_frame = top_frame->GetParent();
   }
-  GetContentClient()->browser()->DidUseGeolocationPermission(
+  GetContentClient()->browser()->RegisterPermissionUsage(
+      content::PERMISSION_GEOLOCATION,
       web_contents(),
       frame->GetLastCommittedURL().GetOrigin(),
       top_frame->GetLastCommittedURL().GetOrigin());
 
   frame->Send(new GeolocationMsg_PositionUpdated(
       frame->GetRoutingID(), geoposition));
 }
 
 void GeolocationDispatcherHost::OnRequestPermission(
     RenderFrameHost* render_frame_host,
     int bridge_id,
     const GURL& requesting_origin,
     bool user_gesture) {
   int render_process_id = render_frame_host->GetProcess()->GetID();
   int render_frame_id = render_frame_host->GetRoutingID();
 
   PendingPermission pending_permission(
       render_frame_id, render_process_id, bridge_id, requesting_origin);
   pending_permissions_.push_back(pending_permission);
 
-  GetContentClient()->browser()->RequestGeolocationPermission(
+  GetContentClient()->browser()->RequestPermission(
+      content::PERMISSION_GEOLOCATION,
       web_contents(),
       bridge_id,
       requesting_origin,
       user_gesture,
       base::Bind(&GeolocationDispatcherHost::SendGeolocationPermissionResponse,
                  weak_factory_.GetWeakPtr(),
-                 render_process_id, render_frame_id, bridge_id));
+                 render_process_id,
+                 render_frame_id,
+                 bridge_id));
 }
 
 void GeolocationDispatcherHost::OnStartUpdating(
     RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     bool enable_high_accuracy) {
   // StartUpdating() can be invoked as a result of high-accuracy mode
   // being enabled / disabled. No need to record the dispatcher again.
   UMA_HISTOGRAM_BOOLEAN(
       "Geolocation.GeolocationDispatcherHostImpl.EnableHighAccuracy",
@@ skipping 72 matching lines @@
 }
 
 void GeolocationDispatcherHost::CancelPermissionRequestsForFrame(
     RenderFrameHost* render_frame_host) {
   int render_process_id = render_frame_host->GetProcess()->GetID();
   int render_frame_id = render_frame_host->GetRoutingID();
 
   for (size_t i = 0; i < pending_permissions_.size(); ++i) {
     if (pending_permissions_[i].render_process_id == render_process_id &&
         pending_permissions_[i].render_frame_id == render_frame_id) {
-      GetContentClient()->browser()->CancelGeolocationPermissionRequest(
+      GetContentClient()->browser()->CancelPermissionRequest(
+          content::PERMISSION_GEOLOCATION,
           web_contents(),
           pending_permissions_[i].bridge_id,
           pending_permissions_[i].origin);
       pending_permissions_.erase(pending_permissions_.begin() + i);
     }
   }
 }
 
 }  // namespace content