Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_context_base.h

Index: chrome/browser/permissions/permission_context_base.h
diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h
index 6c70c6c86abd8d7a028bfc6a3779df7c998bc784..fe696e170ab10441fd45abdaea7d3a1844bd5cf7 100644
--- a/chrome/browser/permissions/permission_context_base.h
+++ b/chrome/browser/permissions/permission_context_base.h
@@ -15,7 +15,7 @@
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/permission_type.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 #if defined(OS_ANDROID)
 class PermissionQueueController;
@@ -74,17 +74,17 @@ class PermissionContextBase : public KeyedService {
   // should be called with the result.
   virtual void RequestPermission(content::WebContents* web_contents,
                                  const PermissionRequestID& id,
-                                 const GURL& requesting_frame,
+                                 const url::Origin& requesting_origin,
                                  const BrowserPermissionCallback& callback);
 
   // Returns whether the permission has been granted, denied...
   virtual ContentSetting GetPermissionStatus(
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) const;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) const;
 
   // Resets the permission to its default value.
-  virtual void ResetPermission(const GURL& requesting_origin,
-                               const GURL& embedding_origin);
+  virtual void ResetPermission(const url::Origin& requesting_origin,
+                               const url::Origin& embedding_origin);
 
   // Withdraw an existing permission request, no op if the permission request
   // was already cancelled by some other means.
@@ -102,21 +102,21 @@ class PermissionContextBase : public KeyedService {
   // or NotifyPermissionSet if permission decided by presenting an infobar.
   virtual 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);
 
   // Called when permission is granted without interactively asking the user.
   void PermissionDecided(const PermissionRequestID& id,
-                         const GURL& requesting_origin,
-                         const GURL& embedding_origin,
+                         const url::Origin& requesting_origin,
+                         const url::Origin& embedding_origin,
                          const BrowserPermissionCallback& callback,
                          bool persist,
                          ContentSetting content_setting);
 
   virtual void NotifyPermissionSet(const PermissionRequestID& id,
-                                   const GURL& requesting_origin,
-                                   const GURL& embedding_origin,
+                                   const url::Origin& requesting_origin,
+                                   const url::Origin& embedding_origin,
                                    const BrowserPermissionCallback& callback,
                                    bool persist,
                                    ContentSetting content_setting);
@@ -124,7 +124,7 @@ class PermissionContextBase : public KeyedService {
   // Implementors can override this method to update the icons on the
   // url bar with the result of the new permission.
   virtual void UpdateTabContext(const PermissionRequestID& id,
-                                const GURL& requesting_origin,
+                                const url::Origin& requesting_origin,
                                 bool allowed) {}
 
 #if defined(OS_ANDROID)
@@ -138,8 +138,8 @@ class PermissionContextBase : public KeyedService {
   // Store the decided permission as a content setting.
   // virtual since the permission might be stored with different restrictions
   // (for example for desktop notifications).
-  virtual void UpdateContentSetting(const GURL& requesting_origin,
-                                    const GURL& embedding_origin,
+  virtual void UpdateContentSetting(const url::Origin& requesting_origin,
+                                    const url::Origin& embedding_origin,
                                     ContentSetting content_setting);
 
   // Whether the permission should be restricted to secure origins.