Have Permission{Manager,Service} use Origin.

chrome/browser/geolocation/geolocation_permission_context.h

Index: chrome/browser/geolocation/geolocation_permission_context.h
diff --git a/chrome/browser/geolocation/geolocation_permission_context.h b/chrome/browser/geolocation/geolocation_permission_context.h
index 1142dd24307a1e31c8eeba375ef71b84e4ab230d..d4f1f396365616c795f28e9a98f5a3d863b064b3 100644
--- a/chrome/browser/geolocation/geolocation_permission_context.h
+++ b/chrome/browser/geolocation/geolocation_permission_context.h
@@ -14,6 +14,10 @@ namespace content {
 class WebContents;
 }
 
+namespace url {
+class Origin;
+}
+
 class PermissionRequestID;
 class Profile;
 
@@ -27,8 +31,8 @@ class GeolocationPermissionContext  : public PermissionContextBase {
   // It also adds special logic when called through an extension.
   void DecidePermission(content::WebContents* web_contents,
                         const PermissionRequestID& id,
-                        const GURL& requesting_origin,
-                        const GURL& embedding_origin,
+                        const url::Origin& requesting_origin,
+                        const url::Origin& embedding_origin,
                         const BrowserPermissionCallback& callback) override;
 
   // Adds special logic when called through an extension.
@@ -37,7 +41,7 @@ class GeolocationPermissionContext  : public PermissionContextBase {
 
  private:
   void UpdateTabContext(const PermissionRequestID& id,
-                        const GURL& requesting_frame,
+                        const url::Origin& requesting_frame,
                         bool allowed) override;
   bool IsRestrictedToSecureOrigins() const override;