Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_manager_unittest.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 "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #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;
 
 namespace {
 
 class PermissionManagerTestingProfile final : public TestingProfile {
  public:
   PermissionManagerTestingProfile() {}
   ~PermissionManagerTestingProfile() override {}
@@ skipping 24 matching lines @@
   PermissionManager* GetPermissionManager() {
     return profile_.GetPermissionManager();
   }
 
   HostContentSettingsMap* GetHostContentSettingsMap() {
     return HostContentSettingsMapFactory::GetForProfile(&profile_);
   }
 
   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) {
     HostContentSettingsMapFactory::GetForProfile(&profile_)
         ->SetContentSettingDefaultScope(url_, url_, type, std::string(), value);
   }
 
   const GURL& url() const {
     return url_;
   }
@@ skipping 56 matching lines @@
 
 #if defined(OS_ANDROID)
   SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
                 CONTENT_SETTING_ALLOW);
   CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
                         content::mojom::PermissionStatus::GRANTED);
 #endif
 }
 
 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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(content::mojom::PermissionStatus::GRANTED, callback_result());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), GURL(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_FALSE(callback_called());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 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)));
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_FALSE(callback_called());
 }
 
 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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       other_url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_FALSE(callback_called());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), other_url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_FALSE(callback_called());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 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)));
 
   GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::Wildcard(),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_GEOLOCATION,
       std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(content::mojom::PermissionStatus::GRANTED, callback_result());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 TEST_F(PermissionManagerTest, ClearSettingsNotifies) {
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       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)));
 
   GetHostContentSettingsMap()->ClearSettingsForOneType(
       CONTENT_SETTINGS_TYPE_GEOLOCATION);
 
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(content::mojom::PermissionStatus::ASK, callback_result());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_BLOCK);
 
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(content::mojom::PermissionStatus::DENIED, callback_result());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 TEST_F(PermissionManagerTest, ChangeWithoutPermissionChangeDoesNotNotify) {
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_FALSE(callback_called());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }
 
 TEST_F(PermissionManagerTest, ChangesBackAndForth) {
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       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)));
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ALLOW);
 
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(content::mojom::PermissionStatus::GRANTED, callback_result());
 
   Reset();
 
   GetHostContentSettingsMap()->SetContentSettingDefaultScope(
       url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
       CONTENT_SETTING_ASK);
 
   EXPECT_TRUE(callback_called());
   EXPECT_EQ(content::mojom::PermissionStatus::ASK, callback_result());
 
   GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
 }