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 0bb24f486164772f39d6f8de4c4b8e5f03bd9898..aa02c040fcfead21f8278edd90177c972952ab9e 100644
--- a/android_webview/browser/aw_permission_manager.h
+++ b/android_webview/browser/aw_permission_manager.h
@@ -25,29 +25,29 @@ 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::PermissionStatus)>& callback) override;
   int RequestPermissions(
-    const std::vector<content::PermissionType>& permissions,
-    content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
-    const base::Callback<void(
-        const std::vector<content::PermissionStatus>&)>& callback) override;
+      const std::vector<content::PermissionType>& permissions,
+      content::RenderFrameHost* render_frame_host,
+      const url::Origin& requesting_origin,
+      const base::Callback<void(const std::vector<content::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::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::PermissionStatus)>& callback) override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;