Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc |
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc |
index 5312a02cc928fa4c32136534ff7e3ccc08a6ae18..bae59734eff727496bdca4e719704e8456da297d 100644 |
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc |
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc |
@@ -368,7 +368,7 @@ TEST_F(HostContentSettingsMapTest, Observer) { |
GURL host("http://example.com/"); |
ContentSettingsPattern primary_pattern = |
- ContentSettingsPattern::FromString("[*.]example.com"); |
+ ContentSettingsPattern::FromString("http://example.com:80"); |
ContentSettingsPattern secondary_pattern = |
ContentSettingsPattern::Wildcard(); |
EXPECT_CALL(observer, OnContentSettingsChanged(host_content_settings_map, |
@@ -949,7 +949,7 @@ TEST_F(HostContentSettingsMapTest, CanonicalizeExceptionsUnicodeOnly) { |
base::DictionaryValue* dummy_payload = new base::DictionaryValue; |
dummy_payload->SetInteger("setting", CONTENT_SETTING_ALLOW); |
- all_settings_dictionary->SetWithoutPathExpansion("[*.]\xC4\x87ira.com,*", |
+ all_settings_dictionary->SetWithoutPathExpansion("www.\xC4\x87ira.com,*", |
dummy_payload); |
} |
@@ -959,9 +959,9 @@ TEST_F(HostContentSettingsMapTest, CanonicalizeExceptionsUnicodeOnly) { |
prefs->GetDictionary(GetPrefName(CONTENT_SETTINGS_TYPE_COOKIES)); |
const base::DictionaryValue* result = NULL; |
EXPECT_FALSE(all_settings_dictionary->GetDictionaryWithoutPathExpansion( |
- "[*.]\xC4\x87ira.com,*", &result)); |
+ "www.\xC4\x87ira.com,*", &result)); |
EXPECT_TRUE(all_settings_dictionary->GetDictionaryWithoutPathExpansion( |
- "[*.]xn--ira-ppa.com,*", &result)); |
+ "www.xn--ira-ppa.com,*", &result)); |
} |
// If both Unicode and its punycode pattern exist, make sure we don't touch the |
@@ -1214,7 +1214,7 @@ TEST_F(HostContentSettingsMapTest, AddContentSettingsObserver) { |
GURL host("http://example.com/"); |
ContentSettingsPattern pattern = |
- ContentSettingsPattern::FromString("[*.]example.com"); |
+ ContentSettingsPattern::FromString("http://example.com:80"); |
EXPECT_CALL(mock_observer, OnContentSettingChanged( |
pattern, ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_COOKIES, "")); |
@@ -1355,6 +1355,12 @@ TEST_F(HostContentSettingsMapTest, MigrateDomainScopedSettings) { |
TestingProfile profile; |
HostContentSettingsMap* host_content_settings_map = |
HostContentSettingsMapFactory::GetForProfile(&profile); |
+ PrefService* prefs = profile.GetPrefs(); |
+ // Set the pref to its initial state. |
raymes
2016/07/25 02:18:27
nit: say why we are doing this.
// Set the pref to
lshang
2016/07/25 04:56:43
Done.
|
+ int default_value; |
+ prefs->GetDefaultPrefValue(prefs::kDomainToOriginMigrationStatus) |
+ ->GetAsInteger(&default_value); |
+ prefs->SetInteger(prefs::kDomainToOriginMigrationStatus, default_value); |
// Set old formatted http settings. |
GURL http_host("http://example.com/"); |
@@ -1466,7 +1472,7 @@ TEST_F(HostContentSettingsMapTest, MigrateDomainScopedSettings) { |
TEST_F(HostContentSettingsMapTest, DomainToOriginMigrationStatus) { |
TestingProfile profile; |
- |
+ // Migration is done on construction of HostContentSettingsMap. |
HostContentSettingsMap* host_content_settings_map = |
HostContentSettingsMapFactory::GetForProfile(&profile); |
@@ -1495,39 +1501,13 @@ TEST_F(HostContentSettingsMapTest, DomainToOriginMigrationStatus) { |
http_host_narrower, http_host_narrower, |
CONTENT_SETTINGS_TYPE_COOKIES, std::string())); |
- // Do migration before sync. |
- host_content_settings_map->MigrateDomainScopedSettings(false); |
- |
- // Settings only apply to origins. Migration got executed. |
- EXPECT_EQ(CONTENT_SETTING_BLOCK, |
- host_content_settings_map->GetContentSetting( |
- http_host_narrower, http_host_narrower, |
- CONTENT_SETTINGS_TYPE_COOKIES, std::string())); |
- |
- GURL https_host("https://example.com/"); |
- GURL https_host_narrower("https://a.example.com/"); |
- |
- host_content_settings_map->SetContentSettingCustomScope( |
- ContentSettingsPattern::FromURL(https_host), |
- ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_COOKIES, |
- std::string(), CONTENT_SETTING_ALLOW); |
- EXPECT_EQ(CONTENT_SETTING_ALLOW, |
- host_content_settings_map->GetContentSetting( |
- https_host, https_host, CONTENT_SETTINGS_TYPE_COOKIES, |
- std::string())); |
- // Settings apply to subdomains. |
- EXPECT_EQ(CONTENT_SETTING_ALLOW, |
- host_content_settings_map->GetContentSetting( |
- https_host_narrower, https_host_narrower, |
- CONTENT_SETTINGS_TYPE_COOKIES, std::string())); |
- |
- // Try to do migration again before sync. |
+ // Do migration again before sync. |
host_content_settings_map->MigrateDomainScopedSettings(false); |
// Settings still apply to subdomains. Migration didn't get executed. |
EXPECT_EQ(CONTENT_SETTING_ALLOW, |
host_content_settings_map->GetContentSetting( |
- https_host_narrower, https_host_narrower, |
+ http_host_narrower, http_host_narrower, |
CONTENT_SETTINGS_TYPE_COOKIES, std::string())); |
// Do migration after sync. |
@@ -1536,7 +1516,7 @@ TEST_F(HostContentSettingsMapTest, DomainToOriginMigrationStatus) { |
// Settings only apply to origins. Migration got executed. |
EXPECT_EQ(CONTENT_SETTING_BLOCK, |
host_content_settings_map->GetContentSetting( |
- https_host_narrower, https_host_narrower, |
+ http_host_narrower, http_host_narrower, |
CONTENT_SETTINGS_TYPE_COOKIES, std::string())); |
GURL http1_host("http://google.com/"); |