Have Permission{Manager,Service} use Origin.

chrome/browser/storage/durable_storage_permission_context.cc

 // Copyright 2013 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/storage/durable_storage_permission_context.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 14 matching lines @@
 
 DurableStoragePermissionContext::DurableStoragePermissionContext(
     Profile* profile)
     : PermissionContextBase(profile,
                             content::PermissionType::DURABLE_STORAGE,
                             CONTENT_SETTINGS_TYPE_DURABLE_STORAGE) {}
 
 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));
 
   // TODO(dgrogan): Remove bookmarks check in favor of site engagement. In the
   // meantime maybe grant permission to A2HS origins as well.
   BookmarkModel* model = BookmarkModelFactory::GetForProfileIfExists(profile());
   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;
     }
   }
 
   NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                       false /* persist */, CONTENT_SETTING_DEFAULT);
 }
 
 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);
 }
 
 bool DurableStoragePermissionContext::IsRestrictedToSecureOrigins() const {
   return true;
 }
 
 bool DurableStoragePermissionContext::IsOriginBookmarked(
     const std::vector<bookmarks::BookmarkModel::URLAndTitle>& bookmarks,
     const GURL& origin) {
   BookmarkModel::URLAndTitle looking_for;
   looking_for.url = origin;
   return std::binary_search(bookmarks.begin(), bookmarks.end(), looking_for,
                             [](const BookmarkModel::URLAndTitle& a,
                                const BookmarkModel::URLAndTitle& b) {
                               return a.url.GetOrigin() < b.url.GetOrigin();
                             });
 }