Use GURLS instead of patterns in SetCookieSetting()

components/content_settings/core/browser/cookie_settings_unittest.cc

Index: components/content_settings/core/browser/cookie_settings_unittest.cc
diff --git a/components/content_settings/core/browser/cookie_settings_unittest.cc b/components/content_settings/core/browser/cookie_settings_unittest.cc
index 55fa23284a13aec4e679483ee4f7057cf414fe62..534e00babc1c4f0f73ab2fc09b460e5c6404e705 100644
--- a/components/content_settings/core/browser/cookie_settings_unittest.cc
+++ b/components/content_settings/core/browser/cookie_settings_unittest.cc
@@ -53,9 +53,7 @@ class CookieSettingsTest : public testing::Test {
 };
 
 TEST_F(CookieSettingsTest, TestWhitelistedScheme) {
-  cookie_settings_->SetCookieSetting(ContentSettingsPattern::Wildcard(),
-                                     ContentSettingsPattern::Wildcard(),
-                                     CONTENT_SETTING_BLOCK);
+  cookie_settings_->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
   EXPECT_FALSE(cookie_settings_->IsReadingCookieAllowed(kHttpSite, kChromeURL));
   EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed(kHttpsSite, kChromeURL));
   EXPECT_TRUE(cookie_settings_->IsReadingCookieAllowed(kChromeURL, kHttpSite));
@@ -71,9 +69,7 @@ TEST_F(CookieSettingsTest, TestWhitelistedScheme) {
 }
 
 TEST_F(CookieSettingsTest, CookiesBlockSingle) {
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kBlockedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_BLOCK);
+  cookie_settings_->SetCookieSetting(kBlockedSite, CONTENT_SETTING_BLOCK);
   EXPECT_FALSE(
       cookie_settings_->IsReadingCookieAllowed(kBlockedSite, kBlockedSite));
 }
@@ -96,9 +92,7 @@ TEST_F(CookieSettingsTest, CookiesAllowThirdParty) {
 }
 
 TEST_F(CookieSettingsTest, CookiesExplicitBlockSingleThirdParty) {
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kBlockedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_BLOCK);
+  cookie_settings_->SetCookieSetting(kBlockedSite, CONTENT_SETTING_BLOCK);
   EXPECT_FALSE(
       cookie_settings_->IsReadingCookieAllowed(kBlockedSite, kFirstPartySite));
   EXPECT_FALSE(
@@ -108,9 +102,8 @@ TEST_F(CookieSettingsTest, CookiesExplicitBlockSingleThirdParty) {
 }
 
 TEST_F(CookieSettingsTest, CookiesExplicitSessionOnly) {
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kBlockedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_SESSION_ONLY);
+  cookie_settings_->SetCookieSetting(kBlockedSite,
+                                     CONTENT_SETTING_SESSION_ONLY);
   EXPECT_TRUE(
       cookie_settings_->IsReadingCookieAllowed(kBlockedSite, kFirstPartySite));
   EXPECT_TRUE(
@@ -126,9 +119,7 @@ TEST_F(CookieSettingsTest, CookiesExplicitSessionOnly) {
 }
 
 TEST_F(CookieSettingsTest, CookiesThirdPartyBlockedExplicitAllow) {
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kAllowedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_ALLOW);
+  cookie_settings_->SetCookieSetting(kAllowedSite, CONTENT_SETTING_ALLOW);
   prefs_.SetBoolean(prefs::kBlockThirdPartyCookies, true);
   EXPECT_TRUE(
       cookie_settings_->IsReadingCookieAllowed(kAllowedSite, kFirstPartySite));
@@ -144,15 +135,13 @@ TEST_F(CookieSettingsTest, CookiesThirdPartyBlockedExplicitAllow) {
 }
 
 TEST_F(CookieSettingsTest, CookiesThirdPartyBlockedAllSitesAllowed) {
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kAllowedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_ALLOW);
+  cookie_settings_->SetCookieSetting(kAllowedSite, CONTENT_SETTING_ALLOW);
   prefs_.SetBoolean(prefs::kBlockThirdPartyCookies, true);
-  // As an example for a pattern that matches all hosts but not all origins,
+  // As an example for a url that matches all hosts but not all origins,
   // match all HTTPS sites.
-  cookie_settings_->SetCookieSetting(kAllHttpsSitesPattern,
-                                     ContentSettingsPattern::Wildcard(),
-                                     CONTENT_SETTING_ALLOW);
+  settings_map_->SetContentSetting(
+      kAllHttpsSitesPattern, ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_ALLOW);
   cookie_settings_->SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
 
   // |kAllowedSite| should be allowed.
@@ -198,9 +187,7 @@ TEST_F(CookieSettingsTest, CookiesBlockEverything) {
 
 TEST_F(CookieSettingsTest, CookiesBlockEverythingExceptAllowed) {
   cookie_settings_->SetDefaultCookieSetting(CONTENT_SETTING_BLOCK);
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kAllowedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_ALLOW);
+  cookie_settings_->SetCookieSetting(kAllowedSite, CONTENT_SETTING_ALLOW);
   EXPECT_FALSE(cookie_settings_->IsReadingCookieAllowed(kFirstPartySite,
                                                         kFirstPartySite));
   EXPECT_FALSE(cookie_settings_->IsSettingCookieAllowed(kFirstPartySite,
@@ -217,13 +204,14 @@ TEST_F(CookieSettingsTest, CookiesBlockEverythingExceptAllowed) {
 }
 
 TEST_F(CookieSettingsTest, CookiesBlockSingleFirstParty) {
-  cookie_settings_->SetCookieSetting(
+  settings_map_->SetContentSetting(
       ContentSettingsPattern::FromURL(kAllowedSite),
-      ContentSettingsPattern::FromURL(kFirstPartySite), CONTENT_SETTING_ALLOW);
-  cookie_settings_->SetCookieSetting(
+      ContentSettingsPattern::FromURL(kFirstPartySite),
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_ALLOW);
+  settings_map_->SetContentSetting(
       ContentSettingsPattern::FromURL(kAllowedSite),
       ContentSettingsPattern::FromURL(kBlockedFirstPartySite),
-      CONTENT_SETTING_BLOCK);
+      CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_BLOCK);
 
   EXPECT_TRUE(
       cookie_settings_->IsReadingCookieAllowed(kAllowedSite, kFirstPartySite));
@@ -260,9 +248,7 @@ TEST_F(CookieSettingsTest, CookiesBlockSingleFirstParty) {
 }
 
 TEST_F(CookieSettingsTest, ExtensionsRegularSettings) {
-  cookie_settings_->SetCookieSetting(
-      ContentSettingsPattern::FromURL(kBlockedSite),
-      ContentSettingsPattern::Wildcard(), CONTENT_SETTING_BLOCK);
+  cookie_settings_->SetCookieSetting(kBlockedSite, CONTENT_SETTING_BLOCK);
 
   // Regular cookie settings also apply to extensions.
   EXPECT_FALSE(