Refactor content client to include a single Request/CancelPermission method.

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 138 matching lines @@
     int bridge_id,
     const GURL& requesting_frame,
     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);
   pending_permissions_.push_back(pending_permission);
 
-  GetContentClient()->browser()->RequestGeolocationPermission(
+  GetContentClient()->browser()->RequestPermission(
+      content::PERMISSION_GEOLOCATION,
       web_contents(),
       bridge_id,
       requesting_frame,
       user_gesture,
       base::Bind(&GeolocationDispatcherHost::SendGeolocationPermissionResponse,
                  weak_factory_.GetWeakPtr(),
                  render_process_id, render_frame_id, bridge_id));
 }
 
 void GeolocationDispatcherHost::OnCancelPermissionRequest(
     RenderFrameHost* render_frame_host,
     int bridge_id,
     const GURL& requesting_frame) {
   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 &&
         pending_permissions_[i].bridge_id == bridge_id) {
-      GetContentClient()->browser()->CancelGeolocationPermissionRequest(
-            web_contents(), bridge_id, requesting_frame);
+      GetContentClient()->browser()->CancelPermissionRequest(
+          content::PERMISSION_GEOLOCATION,
+          web_contents(), bridge_id, requesting_frame);
 
       pending_permissions_.erase(pending_permissions_.begin() + i);
       return;
     }
   }
 }
 
 void GeolocationDispatcherHost::OnStartUpdating(
     RenderFrameHost* render_frame_host,
     const GURL& requesting_frame,
@@ skipping 66 matching lines @@
 
       pending_permissions_.erase(pending_permissions_.begin() + i);
       return;
     }
   }
 
   NOTREACHED();
 }
 
 }  // namespace content