Have Permission{Manager,Service} use Origin.

android_webview/browser/aw_permission_manager.h

Index: android_webview/browser/aw_permission_manager.h
diff --git a/android_webview/browser/aw_permission_manager.h b/android_webview/browser/aw_permission_manager.h
index abb5a396a29bb8e5267dd1eea4fb35b4a564a7e8..ef24a41181c4f57fc393c83345cab3f5a32cad90 100644
--- a/android_webview/browser/aw_permission_manager.h
+++ b/android_webview/browser/aw_permission_manager.h
@@ -25,31 +25,31 @@ class AwPermissionManager : public content::PermissionManager {
   int RequestPermission(
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<void(content::mojom::PermissionStatus)>& callback)
       override;
   int RequestPermissions(
       const std::vector<content::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<
           void(const std::vector<content::mojom::PermissionStatus>&)>& callback)
       override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
-                       const GURL& requesting_origin,
-                       const GURL& embedding_origin) override;
+                       const url::Origin& requesting_origin,
+                       const url::Origin& embedding_origin) override;
   content::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) override;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) override;
   void RegisterPermissionUsage(content::PermissionType permission,
-                               const GURL& requesting_origin,
-                               const GURL& embedding_origin) override;
+                               const url::Origin& requesting_origin,
+                               const url::Origin& embedding_origin) override;
   int SubscribePermissionStatusChange(
       content::PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin,
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin,
       const base::Callback<void(content::mojom::PermissionStatus)>& callback)
       override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;