Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_manager_unittest.cc

Index: chrome/browser/permissions/permission_manager_unittest.cc
diff --git a/chrome/browser/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc
index 9e10194ff38496dcbfe2b3e678d8641145403a9a..5b664bd35fc65dd6ff9457445d63a0d48eb75198 100644
--- a/chrome/browser/permissions/permission_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_manager_unittest.cc
@@ -13,6 +13,7 @@
 #include "content/public/browser/permission_type.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/origin.h"
 
 using content::PermissionType;
 using content::mojom::PermissionStatus;
@@ -57,8 +58,9 @@ class PermissionManagerTest : public testing::Test {
 
   void CheckPermissionStatus(PermissionType type,
                              PermissionStatus expected) {
+    const url::Origin origin(url_);
     EXPECT_EQ(expected, GetPermissionManager()->GetPermissionStatus(
-                            type, url_.GetOrigin(), url_.GetOrigin()));
+                            type, origin, origin));
   }
 
   void SetPermission(ContentSettingsType type, ContentSetting value) {
@@ -135,8 +137,9 @@ TEST_F(PermissionManagerTest, GetPermissionStatusAfterSet) {
 }
 
 TEST_F(PermissionManagerTest, SameTypeChangeNotifies) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -151,8 +154,9 @@ TEST_F(PermissionManagerTest, SameTypeChangeNotifies) {
 }
 
 TEST_F(PermissionManagerTest, DifferentTypeChangeDoesNotNotify) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -166,8 +170,9 @@ TEST_F(PermissionManagerTest, DifferentTypeChangeDoesNotNotify) {
 }
 
 TEST_F(PermissionManagerTest, ChangeAfterUnsubscribeDoesNotNotify) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -181,8 +186,9 @@ TEST_F(PermissionManagerTest, ChangeAfterUnsubscribeDoesNotNotify) {
 }
 
 TEST_F(PermissionManagerTest, DifferentPrimaryUrlDoesNotNotify) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -196,8 +202,9 @@ TEST_F(PermissionManagerTest, DifferentPrimaryUrlDoesNotNotify) {
 }
 
 TEST_F(PermissionManagerTest, DifferentSecondaryUrlDoesNotNotify) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -211,8 +218,9 @@ TEST_F(PermissionManagerTest, DifferentSecondaryUrlDoesNotNotify) {
 }
 
 TEST_F(PermissionManagerTest, WildCardPatternNotifies) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -234,8 +242,9 @@ TEST_F(PermissionManagerTest, ClearSettingsNotifies) {
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -249,8 +258,9 @@ TEST_F(PermissionManagerTest, ClearSettingsNotifies) {
 }
 
 TEST_F(PermissionManagerTest, NewValueCorrectlyPassed) {
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -269,8 +279,9 @@ TEST_F(PermissionManagerTest, ChangeWithoutPermissionChangeDoesNotNotify) {
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));
 
@@ -288,8 +299,9 @@ TEST_F(PermissionManagerTest, ChangesBackAndForth) {
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ASK);
 
+  const url::Origin origin(url());
   int subscription_id = GetPermissionManager()->SubscribePermissionStatusChange(
-      PermissionType::GEOLOCATION, url(), url(),
+      PermissionType::GEOLOCATION, origin, origin,
       base::Bind(&PermissionManagerTest::OnPermissionChange,
                  base::Unretained(this)));