Have Permission{Manager,Service} use Origin.

chrome/browser/geolocation/geolocation_permission_context_android.cc

Index: chrome/browser/geolocation/geolocation_permission_context_android.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_android.cc b/chrome/browser/geolocation/geolocation_permission_context_android.cc
index 57fa1dfc9ce53d8b205719a22ad05cd195b51c1e..de60d24631e559ceda9b9471a037896c5db55735 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_android.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_android.cc
@@ -15,7 +15,7 @@
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 GeolocationPermissionContextAndroid::
     GeolocationPermissionContextAndroid(Profile* profile)
@@ -31,16 +31,16 @@ GeolocationPermissionContextAndroid::~GeolocationPermissionContextAndroid() {
 void GeolocationPermissionContextAndroid::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
-    const GURL& requesting_frame_origin,
+    const url::Origin& requesting_frame_origin,
     const BrowserPermissionCallback& callback) {
   if (!location_settings_->CanSitesRequestLocationPermission(web_contents)) {
     PermissionDecided(id, requesting_frame_origin,
-                      web_contents->GetLastCommittedURL().GetOrigin(),
+                      url::Origin(web_contents->GetLastCommittedURL()),
                       callback, false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
 
-  GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
+  const url::Origin embedding_origin(web_contents->GetLastCommittedURL());
   ContentSetting content_setting =
       GeolocationPermissionContext::GetPermissionStatus(requesting_frame_origin,
                                                         embedding_origin);
@@ -77,8 +77,8 @@ void GeolocationPermissionContextAndroid::CancelPermissionRequest(
 
 void GeolocationPermissionContextAndroid::HandleUpdateAndroidPermissions(
     const PermissionRequestID& id,
-    const GURL& requesting_frame_origin,
-    const GURL& embedding_origin,
+    const url::Origin& requesting_frame_origin,
+    const url::Origin& embedding_origin,
     const BrowserPermissionCallback& callback,
     bool permissions_updated) {
   permission_update_infobar_ = nullptr;