Have Permission{Manager,Service} use Origin.

chrome/browser/storage/durable_storage_permission_context.cc

Index: chrome/browser/storage/durable_storage_permission_context.cc
diff --git a/chrome/browser/storage/durable_storage_permission_context.cc b/chrome/browser/storage/durable_storage_permission_context.cc
index 6d38dabfa4cba0995b37fd23e96a2336f07ff21c..e2f68cba594326c18470b118f2f573605adfac38 100644
--- a/chrome/browser/storage/durable_storage_permission_context.cc
+++ b/chrome/browser/storage/durable_storage_permission_context.cc
@@ -32,8 +32,8 @@ DurableStoragePermissionContext::DurableStoragePermissionContext(
 void DurableStoragePermissionContext::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(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
@@ -43,7 +43,7 @@ void DurableStoragePermissionContext::DecidePermission(
   if (model) {
     std::vector<bookmarks::BookmarkModel::URLAndTitle> bookmarks;
     model->GetBookmarks(&bookmarks);
-    if (IsOriginBookmarked(bookmarks, requesting_origin)) {
+    if (IsOriginBookmarked(bookmarks, GURL(requesting_origin.Serialize()))) {
       NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                           true /* persist */, CONTENT_SETTING_ALLOW);
       return;
@@ -55,16 +55,18 @@ void DurableStoragePermissionContext::DecidePermission(
 }
 
 void DurableStoragePermissionContext::UpdateContentSetting(
-    const GURL& requesting_origin,
-    const GURL& embedding_origin_ignored,
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin_ignored,
     ContentSetting content_setting) {
-  DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
-  DCHECK_EQ(embedding_origin_ignored, embedding_origin_ignored.GetOrigin());
+  const GURL requesting_url(requesting_origin.Serialize());
+  const GURL embedding_url(embedding_origin_ignored.Serialize());
+  DCHECK_EQ(requesting_origin, url::Origin(requesting_url));
+  DCHECK_EQ(embedding_origin_ignored, url::Origin(embedding_url));
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK);
 
   HostContentSettingsMapFactory::GetForProfile(profile())
-      ->SetContentSettingDefaultScope(requesting_origin, GURL(),
+      ->SetContentSettingDefaultScope(requesting_url, GURL(),
                                       CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
                                       std::string(), content_setting);
 }