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 cd3926f195a7c51ddd0d5070de31e7f40caf87ce..f7aef38aa6d66fe2109e8d0d63d30c961d08a64e 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::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) {
@@ -137,8 +139,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)));
 
@@ -156,8 +159,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)));
 
@@ -174,8 +178,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)));
 
@@ -192,8 +197,9 @@ TEST_F(PermissionManagerTest, ChangeAfterUnsubscribeDoesNotNotify) {
 }
 
 TEST_F(PermissionManagerTest, DifferentPrimaryPatternDoesNotNotify) {
+  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)));
 
@@ -210,8 +216,9 @@ TEST_F(PermissionManagerTest, DifferentPrimaryPatternDoesNotNotify) {
 }
 
 TEST_F(PermissionManagerTest, DifferentSecondaryPatternDoesNotNotify) {
+  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)));
 
@@ -228,8 +235,9 @@ TEST_F(PermissionManagerTest, DifferentSecondaryPatternDoesNotNotify) {
 }
 
 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)));
 
@@ -254,8 +262,9 @@ TEST_F(PermissionManagerTest, ClearSettingsNotifies) {
       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)));
 
@@ -269,8 +278,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)));
 
@@ -295,8 +305,9 @@ TEST_F(PermissionManagerTest, ChangeWithoutPermissionChangeDoesNotNotify) {
       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)));
 
@@ -320,8 +331,9 @@ TEST_F(PermissionManagerTest, ChangesBackAndForth) {
       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)));