Do not send IPC message to cancel Geolocation permission.

content/browser/geolocation/geolocation_dispatcher_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_DISPATCHER_HOST_H_
 #define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_DISPATCHER_HOST_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 17 matching lines @@
   // If the web contents is paused while not currently using geolocation but
   // then goes on to do so before being resumed, then it will not get
   // geolocation updates until it is resumed.
   void PauseOrResume(bool should_pause);
 
  private:
   // 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);
 
   // Updates the geolocation provider with the currently required update
   // options.
   void RefreshGeolocationOptions();
 
   void OnLocationUpdate(const Geoposition& position);
 
   void SendGeolocationPermissionResponse(int render_process_id,
                                          int render_frame_id,
                                          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_;
   bool paused_;
 
   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_;
 
   scoped_ptr<GeolocationProvider::Subscription> geolocation_subscription_;
 
   base::WeakPtrFactory<GeolocationDispatcherHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationDispatcherHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_DISPATCHER_HOST_H_