Do not send IPC message to cancel Geolocation permission.

content/browser/geolocation/geolocation_dispatcher_host.h

Index: content/browser/geolocation/geolocation_dispatcher_host.h
diff --git a/content/browser/geolocation/geolocation_dispatcher_host.h b/content/browser/geolocation/geolocation_dispatcher_host.h
index cd814cbcff70ef67151d8dc1ddf1649f31fad7eb..21fc299c44e6d81e82f72526812d33cdaa6b994a 100644
--- a/content/browser/geolocation/geolocation_dispatcher_host.h
+++ b/content/browser/geolocation/geolocation_dispatcher_host.h
@@ -35,19 +35,19 @@ class GeolocationDispatcherHost : public WebContentsObserver {
   virtual void RenderFrameDeleted(RenderFrameHost* render_frame_host) OVERRIDE;
   virtual void RenderViewHostChanged(RenderViewHost* old_host,
                                      RenderViewHost* new_host) OVERRIDE;
+  virtual void DidNavigateAnyFrame(RenderFrameHost* render_frame_host,
+                                   const LoadCommittedDetails& details,
+                                   const FrameNavigateParams& params) OVERRIDE;
   virtual bool OnMessageReceived(
       const IPC::Message& msg, RenderFrameHost* render_frame_host) OVERRIDE;
 
   // Message handlers:
   void OnRequestPermission(RenderFrameHost* render_frame_host,
                            int bridge_id,
-                           const GURL& requesting_frame,
+                           const GURL& requesting_origin,

[Charlie Reis, 2014/10/07 21:35:35]

nit: Can you add a similar TODO as the one above
GeolocationDispatcher::requestPermission?  This isn't actually guaranteed to be
an origin yet, since the renderer could pass any URL.  (I do agree with the name
change, though.)

[mlamouri (slow - plz ping), 2014/10/08 09:24:33]

Done.

                            bool user_gesture);
-  void OnCancelPermissionRequest(RenderFrameHost* render_frame_host,
-                                 int bridge_id,
-                                 const GURL& requesting_frame);
   void OnStartUpdating(RenderFrameHost* render_frame_host,
-                       const GURL& requesting_frame,
+                       const GURL& requesting_origin,
                        bool enable_high_accuracy);
   void OnStopUpdating(RenderFrameHost* render_frame_host);
 
@@ -62,6 +62,10 @@ class GeolocationDispatcherHost : public WebContentsObserver {
                                          int bridge_id,
                                          bool allowed);
 
+  // Clear pending permissions associated with a given frame and request the
+  // browser to cancel the permission requests.
+  void CancelPermissionRequestsForFrame(RenderFrameHost* render_frame_host);
+
   // A map from the RenderFrameHosts that have requested geolocation updates to
   // the type of accuracy they requested (true = high accuracy).
   std::map<RenderFrameHost*, bool> updating_frames_;
@@ -70,11 +74,13 @@ class GeolocationDispatcherHost : public WebContentsObserver {
   struct PendingPermission {
     PendingPermission(int render_frame_id,
                       int render_process_id,
-                      int bridge_id);
+                      int bridge_id,
+                      const GURL& origin);
     ~PendingPermission();
     int render_frame_id;
     int render_process_id;
     int bridge_id;
+    GURL origin;
   };
   std::vector<PendingPermission> pending_permissions_;