Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_context_base_unittest.cc

Index: chrome/browser/permissions/permission_context_base_unittest.cc
diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc
index 8c052ba71900acd8c662d4bcee089317fd777477..61467c277ad79773c97a3434dfe247bca33ce775 100644
--- a/chrome/browser/permissions/permission_context_base_unittest.cc
+++ b/chrome/browser/permissions/permission_context_base_unittest.cc
@@ -89,7 +89,7 @@ class TestPermissionContext : public PermissionContextBase {
 
  protected:
   void UpdateTabContext(const PermissionRequestID& id,
-                        const GURL& requesting_origin,
+                        const url::Origin& requesting_origin,
                         bool allowed) override {
     tab_context_updated_ = true;
   }
@@ -144,15 +144,16 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     TestPermissionContext permission_context(
         profile(), content::PermissionType::NOTIFICATIONS,
         CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
-    GURL url("http://www.google.com");
+    const GURL url("http://www.google.com");
     NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
         -1);
+    const url::Origin origin(url);
     permission_context.RequestPermission(
-        web_contents(), id, url,
+        web_contents(), id, origin,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
@@ -168,15 +169,16 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     TestPermissionContext permission_context(
         profile(), content::PermissionType::MIDI_SYSEX,
         CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
-    GURL url("http://www.google.es");
+    const GURL url("http://www.google.es");
     NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
         -1);
+    const url::Origin origin(url);
     permission_context.RequestPermission(
-        web_contents(), id, url,
+        web_contents(), id, origin,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
@@ -193,7 +195,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
       ContentSettingsType content_settings_type) {
     TestPermissionContext permission_context(profile(), permission_type,
                                              content_settings_type);
-    GURL url;
+    const GURL url;
     ASSERT_FALSE(url.is_valid());
     NavigateAndCommit(url);
 
@@ -201,8 +203,9 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
         -1);
+    const url::Origin origin(url);
     permission_context.RequestPermission(
-        web_contents(), id, url,
+        web_contents(), id, origin,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
@@ -218,15 +221,16 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
                                       ContentSetting expected_default) {
     TestPermissionContext permission_context(profile(), permission_type,
                                              content_settings_type);
-    GURL url("https://www.google.com");
+    const GURL url("https://www.google.com");
     NavigateAndCommit(url);
 
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
         -1);
+    const url::Origin origin(url);
     permission_context.RequestPermission(
-        web_contents(), id, url,
+        web_contents(), id, origin,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
 
@@ -238,7 +242,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
               permission_context.GetContentSettingFromMap(url, url));
 
     // Try to reset permission.
-    permission_context.ResetPermission(url.GetOrigin(), url.GetOrigin());
+    permission_context.ResetPermission(origin, origin);
     ContentSetting setting_after_reset =
         permission_context.GetContentSettingFromMap(url, url);
     ContentSetting default_setting =
@@ -272,7 +276,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     TestPermissionContext permission_context(
         profile(), content::PermissionType::NOTIFICATIONS,
         CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
-    GURL url("http://www.google.com");
+    const GURL url("http://www.google.com");
     NavigateAndCommit(url);
 
     const PermissionRequestID id0(
@@ -282,12 +286,13 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(), 1);
 
+    const url::Origin origin(url);
     permission_context.RequestPermission(
-        web_contents(), id0, url,
+        web_contents(), id0, origin,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
     permission_context.RequestPermission(
-        web_contents(), id1, url,
+        web_contents(), id1, origin,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));