Have Permission{Manager,Service} use Origin.

chrome/browser/notifications/notification_permission_context_unittest.cc

Index: chrome/browser/notifications/notification_permission_context_unittest.cc
diff --git a/chrome/browser/notifications/notification_permission_context_unittest.cc b/chrome/browser/notifications/notification_permission_context_unittest.cc
index 9415ca4becc00fb056245fe6729f17b94dfe1427..8c8a5c3cd10a25c33dee051829c7fe5d6e9c2477 100644
--- a/chrome/browser/notifications/notification_permission_context_unittest.cc
+++ b/chrome/browser/notifications/notification_permission_context_unittest.cc
@@ -56,8 +56,8 @@ class TestNotificationPermissionContext : public NotificationPermissionContext {
  private:
   // NotificationPermissionContext:
   void NotifyPermissionSet(const PermissionRequestID& id,
-                           const GURL& requesting_origin,
-                           const GURL& embedder_origin,
+                           const url::Origin& requesting_origin,
+                           const url::Origin& embedder_origin,
                            const BrowserPermissionCallback& callback,
                            bool persist,
                            ContentSetting content_setting) override {
@@ -103,9 +103,12 @@ class NotificationPermissionContextTest
 // Web Notification permission requests will completely ignore the embedder
 // origin. See https://crbug.com/416894.
 TEST_F(NotificationPermissionContextTest, IgnoresEmbedderOrigin) {
-  GURL requesting_origin("https://example.com");
-  GURL embedding_origin("https://chrome.com");
-  GURL different_origin("https://foobar.com");
+  const GURL requesting_url("https://example.com");
+  const url::Origin requesting_origin(requesting_url);
+  const GURL embedding_url("https://chrome.com");
+  const url::Origin embedding_origin(embedding_url);
+  const GURL different_url("https://foobar.com");
+  const url::Origin different_origin(different_url);
 
   NotificationPermissionContext context(profile());
   context.UpdateContentSetting(requesting_origin,
@@ -130,23 +133,22 @@ TEST_F(NotificationPermissionContextTest, IgnoresEmbedderOrigin) {
 // Web Notifications do not require a secure origin when requesting permission.
 // See https://crbug.com/404095.
 TEST_F(NotificationPermissionContextTest, NoSecureOriginRequirement) {
-  GURL origin("http://example.com");
+  const GURL url("http://example.com");
+  const url::Origin origin("http://example.com");
 
   NotificationPermissionContext context(profile());
-  EXPECT_EQ(CONTENT_SETTING_ASK,
-            context.GetPermissionStatus(origin, origin));
+  EXPECT_EQ(CONTENT_SETTING_ASK, context.GetPermissionStatus(origin, origin));
 
   context.UpdateContentSetting(origin, origin, CONTENT_SETTING_ALLOW);
 
-  EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            context.GetPermissionStatus(origin, origin));
+  EXPECT_EQ(CONTENT_SETTING_ALLOW, context.GetPermissionStatus(origin, origin));
 }
 
 // Tests auto-denial after a time delay in incognito.
 TEST_F(NotificationPermissionContextTest, TestDenyInIncognitoAfterDelay) {
   TestNotificationPermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
-  GURL url("https://www.example.com");
+  const GURL url("https://www.example.com");
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
@@ -160,8 +162,9 @@ TEST_F(NotificationPermissionContextTest, TestDenyInIncognitoAfterDelay) {
   ASSERT_EQ(CONTENT_SETTING_DEFAULT,
             permission_context.last_permission_set_setting());
 
-  permission_context.RequestPermission(
-      web_contents(), id, url, base::Bind(&DoNothing));
+  const url::Origin origin(url);
+  permission_context.RequestPermission(web_contents(), id, origin,
+                                       base::Bind(&DoNothing));
 
   // Should be blocked after 1-2 seconds, but the timer is reset whenever the
   // tab is not visible, so these 500ms never add up to >= 1 second.
@@ -212,7 +215,7 @@ TEST_F(NotificationPermissionContextTest, TestDenyInIncognitoAfterDelay) {
 TEST_F(NotificationPermissionContextTest, TestCancelledIncognitoRequest) {
   TestNotificationPermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
-  GURL url("https://www.example.com");
+  const GURL url("https://www.example.com");
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
@@ -228,9 +231,10 @@ TEST_F(NotificationPermissionContextTest, TestCancelledIncognitoRequest) {
   // Request and cancel the permission via PermissionManager. That way if
   // https://crbug.com/586944 regresses, then as well as the EXPECT_EQs below
   // failing, PermissionManager::OnPermissionsRequestResponseStatus will crash.
+  const url::Origin origin(url);
   int request_id = permission_manager->RequestPermission(
       content::PermissionType::NOTIFICATIONS, web_contents()->GetMainFrame(),
-      url.GetOrigin(), base::Bind(&DoNothing2));
+      origin, base::Bind(&DoNothing2));
 
   permission_manager->CancelPermissionRequest(request_id);
 
@@ -245,7 +249,7 @@ TEST_F(NotificationPermissionContextTest, TestCancelledIncognitoRequest) {
 TEST_F(NotificationPermissionContextTest, TestParallelDenyInIncognito) {
   TestNotificationPermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
-  GURL url("https://www.example.com");
+  const GURL url("https://www.example.com");
   NavigateAndCommit(url);
   web_contents()->WasShown();
 
@@ -263,9 +267,10 @@ TEST_F(NotificationPermissionContextTest, TestParallelDenyInIncognito) {
   ASSERT_EQ(CONTENT_SETTING_DEFAULT,
             permission_context.last_permission_set_setting());
 
-  permission_context.RequestPermission(web_contents(), id0, url,
+  const url::Origin origin(url);
+  permission_context.RequestPermission(web_contents(), id0, origin,
                                        base::Bind(&DoNothing));
-  permission_context.RequestPermission(web_contents(), id1, url,
+  permission_context.RequestPermission(web_contents(), id1, origin,
                                        base::Bind(&DoNothing));
 
   EXPECT_EQ(0, permission_context.permission_set_count());