Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_manager.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/permissions/permission_manager.h"
 
 #include <stddef.h>
 
 #include "base/callback.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_context.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
+#include "url/origin.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #endif
 
 using content::mojom::PermissionStatus;
 using content::PermissionType;
 
 namespace {
 
@@ skipping 150 matching lines @@
   int render_process_id_;
   int render_frame_id_;
   const base::Callback<void(const std::vector<PermissionStatus>&)> callback_;
   std::vector<PermissionType> permissions_;
   std::vector<PermissionStatus> results_;
   size_t remaining_results_;
 };
 
 struct PermissionManager::Subscription {
   PermissionType permission;
-  GURL requesting_origin;
-  GURL embedding_origin;
+  url::Origin requesting_origin;
+  url::Origin embedding_origin;
   base::Callback<void(PermissionStatus)> callback;
   ContentSetting current_value;
 };
 
 PermissionManager::PermissionManager(Profile* profile)
     : profile_(profile),
       weak_ptr_factory_(this) {
 }
 
 PermissionManager::~PermissionManager() {
   if (!subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->RemoveObserver(this);
 }
 
 int PermissionManager::RequestPermission(
     PermissionType permission,
     content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
+    const url::Origin& requesting_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   return RequestPermissions(
       std::vector<PermissionType>(1, permission),
       render_frame_host,
       requesting_origin,
       base::Bind(&PermissionRequestResponseCallbackWrapper, callback));
 }
 
 int PermissionManager::RequestPermissions(
     const std::vector<PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
-    const base::Callback<void(
-        const std::vector<PermissionStatus>&)>& callback) {
+    const url::Origin& requesting_origin,
+    const base::Callback<void(const std::vector<PermissionStatus>&)>&
+        callback) {
   if (permissions.empty()) {
     callback.Run(std::vector<PermissionStatus>());
     return kNoPendingOperation;
   }
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
-  GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
+  const url::Origin embedding_origin(web_contents->GetLastCommittedURL());
 
   PendingRequest* pending_request = new PendingRequest(
       render_frame_host, permissions, callback);
   int request_id = pending_requests_.Add(pending_request);
 
   const PermissionRequestID request(render_frame_host, request_id);
 
   for (size_t i = 0; i < permissions.size(); ++i) {
     const PermissionType permission = permissions[i];
 
@@ skipping 55 matching lines @@
     PermissionContextBase* context = PermissionContext::Get(
         profile_, permission);
     if (!context)
       continue;
     context->CancelPermissionRequest(web_contents, request);
   }
   pending_requests_.Remove(request_id);
 }
 
 void PermissionManager::ResetPermission(PermissionType permission,
-                                        const GURL& requesting_origin,
-                                        const GURL& embedding_origin) {
+                                        const url::Origin& requesting_origin,
+                                        const url::Origin& embedding_origin) {
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context)
     return;
 
-  context->ResetPermission(requesting_origin.GetOrigin(),
-                           embedding_origin.GetOrigin());
+  context->ResetPermission(requesting_origin, embedding_origin);
 }
 
 PermissionStatus PermissionManager::GetPermissionStatus(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   if (IsConstantPermission(permission))
     return GetPermissionStatusForConstantPermission(permission);
 
   PermissionContextBase* context = PermissionContext::Get(profile_, permission);
   if (!context)
     return content::mojom::PermissionStatus::DENIED;
 
-  return ContentSettingToPermissionStatus(context->GetPermissionStatus(
-      requesting_origin.GetOrigin(), embedding_origin.GetOrigin()));
+  return ContentSettingToPermissionStatus(
+      context->GetPermissionStatus(requesting_origin, embedding_origin));
 }
 
-void PermissionManager::RegisterPermissionUsage(PermissionType permission,
-                                                const GURL& requesting_origin,
-                                                const GURL& embedding_origin) {
+void PermissionManager::RegisterPermissionUsage(
+    PermissionType permission,
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   // This is required because constant permissions don't have a
   // ContentSettingsType.
   if (IsConstantPermission(permission))
     return;
 
   HostContentSettingsMapFactory::GetForProfile(profile_)->UpdateLastUsage(
-      requesting_origin,
-      embedding_origin,
+      GURL(requesting_origin.Serialize()), GURL(embedding_origin.Serialize()),
       PermissionTypeToContentSetting(permission));
 }
 
 int PermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin,
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   if (subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)->AddObserver(this);
 
   Subscription* subscription = new Subscription();
   subscription->permission = permission;
   subscription->requesting_origin = requesting_origin;
   subscription->embedding_origin = embedding_origin;
   subscription->callback = callback;
 
@@ skipping 34 matching lines @@
 
   for (SubscriptionsMap::iterator iter(&subscriptions_);
        !iter.IsAtEnd(); iter.Advance()) {
     Subscription* subscription = iter.GetCurrentValue();
     if (PermissionTypeToContentSetting(subscription->permission) !=
         content_type) {
       continue;
     }
 
     if (primary_pattern.IsValid() &&
-        !primary_pattern.Matches(subscription->requesting_origin))
+        !primary_pattern.Matches(
+            GURL(subscription->requesting_origin.Serialize()))) {
       continue;
+    }
     if (secondary_pattern.IsValid() &&
-        !secondary_pattern.Matches(subscription->embedding_origin))
+        !secondary_pattern.Matches(
+            GURL(subscription->embedding_origin.Serialize()))) {
       continue;
+    }
 
     ContentSetting new_value =
         PermissionContext::Get(profile_, subscription->permission)
             ->GetPermissionStatus(subscription->requesting_origin,
                                   subscription->embedding_origin);
     if (subscription->current_value == new_value)
       continue;
 
     subscription->current_value = new_value;
 
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }