Have Permission{Manager,Service} use Origin.

chrome/browser/geolocation/geolocation_permission_context_android.h

Index: chrome/browser/geolocation/geolocation_permission_context_android.h
diff --git a/chrome/browser/geolocation/geolocation_permission_context_android.h b/chrome/browser/geolocation/geolocation_permission_context_android.h
index 012839f804d6412fb68a9986bd5567d1b4f75a24..876def9ea82dfcac120da50b69b80fe2355cd9b6 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_android.h
+++ b/chrome/browser/geolocation/geolocation_permission_context_android.h
@@ -33,8 +33,11 @@ namespace infobars {
 class InfoBar;
 }
 
+namespace url {
+class Origin;
+}
+
 class LocationSettings;
-class GURL;
 class PermissionRequestID;
 
 class GeolocationPermissionContextAndroid
@@ -47,19 +50,19 @@ class GeolocationPermissionContextAndroid
   friend class GeolocationPermissionContextTests;
 
   // GeolocationPermissionContext:
-  void RequestPermission(
-      content::WebContents* web_contents,
-      const PermissionRequestID& id,
-      const GURL& requesting_frame_origin,
-      const BrowserPermissionCallback& callback) override;
+  void RequestPermission(content::WebContents* web_contents,
+                         const PermissionRequestID& id,
+                         const url::Origin& requesting_frame_origin,
+                         const BrowserPermissionCallback& callback) override;
   void CancelPermissionRequest(content::WebContents* web_contents,
                                const PermissionRequestID& id) override;
 
-  void HandleUpdateAndroidPermissions(const PermissionRequestID& id,
-                                      const GURL& requesting_frame_origin,
-                                      const GURL& embedding_origin,
-                                      const BrowserPermissionCallback& callback,
-                                      bool permissions_updated);
+  void HandleUpdateAndroidPermissions(
+      const PermissionRequestID& id,
+      const url::Origin& requesting_frame_origin,
+      const url::Origin& embedding_origin,
+      const BrowserPermissionCallback& callback,
+      bool permissions_updated);
 
   // Overrides the LocationSettings object used to determine whether
   // system and Chrome-wide location permissions are enabled.