Have Permission{Manager,Service} use Origin.

chrome/browser/notifications/notification_permission_context.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/notification_permission_context.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/callback.h"
@@ skipping 150 matching lines @@
 
 NotificationPermissionContext::NotificationPermissionContext(Profile* profile)
     : PermissionContextBase(profile,
                             content::PermissionType::NOTIFICATIONS,
                             CONTENT_SETTINGS_TYPE_NOTIFICATIONS),
       weak_factory_ui_thread_(this) {}
 
 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(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   if (profile()->IsOffTheRecord()) {
     VisibilityTimerTabHelper::FromWebContents(web_contents)->CancelTask(id);
   } else {
     PermissionContextBase::CancelPermissionRequest(web_contents, id);
   }
 }
 
 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);
 
   // Notifications permission is always denied in incognito. To prevent sites
   // from using that to detect whether incognito mode is active, we deny after a
   // random time delay, to simulate a user clicking a bubble/infobar. See also
   // ContentSettingsRegistry::Init, which marks notifications as
   // INHERIT_IN_INCOGNITO_EXCEPT_ALLOW, and
   // PermissionMenuModel::PermissionMenuModel which prevents users from manually
   // allowing the permission.
@@ skipping 15 matching lines @@
   PermissionContextBase::DecidePermission(web_contents, id, requesting_origin,
                                           embedding_origin, callback);
 }
 
 // Unlike other permission types, granting a notification for a given origin
 // will not take into account the |embedder_origin|, it will only be based
 // on the requesting iframe origin.
 // 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);
   }
 }
 
 bool NotificationPermissionContext::IsRestrictedToSecureOrigins() const {
   return false;
 }