Have Permission{Manager,Service} use Origin.

chrome/browser/notifications/notification_permission_context.cc

Index: chrome/browser/notifications/notification_permission_context.cc
diff --git a/chrome/browser/notifications/notification_permission_context.cc b/chrome/browser/notifications/notification_permission_context.cc
index 497abf28ba6ab8f6b4b5a9bcea1e7f76509aff3e..50626696d147e7672d6008b91b2f50e7d276f088 100644
--- a/chrome/browser/notifications/notification_permission_context.cc
+++ b/chrome/browser/notifications/notification_permission_context.cc
@@ -168,10 +168,11 @@ NotificationPermissionContext::NotificationPermissionContext(Profile* profile)
 NotificationPermissionContext::~NotificationPermissionContext() {}
 
 void NotificationPermissionContext::ResetPermission(
-    const GURL& requesting_origin,
-    const GURL& embedder_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedder_origin) {
   DesktopNotificationProfileUtil::ClearSetting(
-      profile(), ContentSettingsPattern::FromURLNoWildcard(requesting_origin));
+      profile(), ContentSettingsPattern::FromURLNoWildcard(
+                     GURL(requesting_origin.Serialize())));
 }
 
 void NotificationPermissionContext::CancelPermissionRequest(
@@ -187,8 +188,8 @@ void NotificationPermissionContext::CancelPermissionRequest(
 void NotificationPermissionContext::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) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -224,18 +225,17 @@ void NotificationPermissionContext::DecidePermission(
 // TODO(mukai) Consider why notifications behave differently than
 // other permissions. https://crbug.com/416894
 void NotificationPermissionContext::UpdateContentSetting(
-    const GURL& requesting_origin,
-    const GURL& embedder_origin,
+    const url::Origin& requesting_origin,
+    const url::Origin& embedder_origin,
     ContentSetting content_setting) {
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
 
+  const GURL requesting_url(requesting_origin.Serialize());
   if (content_setting == CONTENT_SETTING_ALLOW) {
-    DesktopNotificationProfileUtil::GrantPermission(profile(),
-                                                    requesting_origin);
+    DesktopNotificationProfileUtil::GrantPermission(profile(), requesting_url);
   } else {
-    DesktopNotificationProfileUtil::DenyPermission(profile(),
-                                                   requesting_origin);
+    DesktopNotificationProfileUtil::DenyPermission(profile(), requesting_url);
   }
 }