Introduce GeolocationPermissionRequestID, a wrapper struct to contain the (render process ID, rende…

chrome/browser/geolocation/chrome_geolocation_permission_context.h

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.h
===================================================================
--- chrome/browser/geolocation/chrome_geolocation_permission_context.h	(revision 163741)
+++ chrome/browser/geolocation/chrome_geolocation_permission_context.h	(working copy)
@@ -23,15 +23,11 @@
 
   // GeolocationPermissionContext implementation:
   virtual void RequestGeolocationPermission(
-      int render_process_id,
-      int render_view_id,
-      int bridge_id,
+      const content::GeolocationPermissionRequestID& id,
       const GURL& requesting_frame,
       base::Callback<void(bool)> callback) OVERRIDE;
   virtual void CancelGeolocationPermissionRequest(
-      int render_process_id,
-      int render_view_id,
-      int bridge_id,
+      const content::GeolocationPermissionRequestID& id,
       const GURL& requesting_frame) OVERRIDE;
 
  protected:
@@ -47,9 +43,7 @@
   // geolocation via
   // GeolocationPermissionContext::SetGeolocationPermissionResponse().
   // Called on the UI thread.
-  void NotifyPermissionSet(int render_process_id,
-                           int render_view_id,
-                           int bridge_id,
+  void NotifyPermissionSet(const content::GeolocationPermissionRequestID& id,
                            const GURL& requesting_frame,
                            base::Callback<void(bool)> callback,
                            bool allowed);
@@ -59,24 +53,22 @@
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an
   // infobar to the user. Called on the UI thread.
-  virtual void DecidePermission(int render_process_id,
-                                int render_view_id,
-                                int bridge_id,
-                                const GURL& requesting_frame,
-                                const GURL& embedder,
-                                base::Callback<void(bool)> callback);
+  virtual void DecidePermission(
+      const content::GeolocationPermissionRequestID& id,
+      const GURL& requesting_frame,
+      const GURL& embedder,
+      base::Callback<void(bool)> callback);
 
   // Called when permission is granted without interactively asking
   // the user. Can be overridden to introduce additional UI flow.
   // Should ultimately ensure that NotifyPermissionSet is called.
   // Called on the UI thread.
-  virtual void PermissionDecided(int render_process_id,
-                                 int render_view_id,
-                                 int bridge_id,
-                                 const GURL& requesting_frame,
-                                 const GURL& embedder,
-                                 base::Callback<void(bool)> callback,
-                                 bool allowed);
+  virtual void PermissionDecided(
+      const content::GeolocationPermissionRequestID& id,
+      const GURL& requesting_frame,
+      const GURL& embedder,
+      base::Callback<void(bool)> callback,
+      bool allowed);
 
   // Create an InfoBarQueueController. overriden in derived classes to provide
   // additional UI flow.  Called on the UI thread.
@@ -84,9 +76,8 @@
 
  private:
   // Removes any pending InfoBar request.
-  void CancelPendingInfoBarRequest(int render_process_id,
-                                   int render_view_id,
-                                   int bridge_id);
+  void CancelPendingInfoBarRequest(
+      const content::GeolocationPermissionRequestID& id);
 
   // This must only be accessed from the UI thread.
   Profile* const profile_;