diff options
Diffstat (limited to 'chrome/browser/content_settings/host_content_settings_map_unittest.cc')
| -rw-r--r-- | chrome/browser/content_settings/host_content_settings_map_unittest.cc | 238 |
1 files changed, 119 insertions, 119 deletions
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 bba4336..57fd929 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc @@ -81,16 +81,16 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) { ContentSettingsPattern::FromString("[*.]example.com"); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_IMAGES, - std::string(), + "", CONTENT_SETTING_DEFAULT); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), @@ -99,10 +99,10 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) { CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_PLUGINS, "")); // Check returning all settings for a host. host_content_settings_map->SetContentSetting( @@ -113,7 +113,7 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) { CONTENT_SETTING_DEFAULT); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), @@ -122,7 +122,7 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) { CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), @@ -131,23 +131,22 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) { CONTENT_SETTING_ALLOW); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_PLUGINS, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_POPUPS, "")); + EXPECT_EQ(CONTENT_SETTING_ASK, + host_content_settings_map->GetContentSetting( + host, host, CONTENT_SETTINGS_TYPE_GEOLOCATION, "")); EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); - EXPECT_EQ( - CONTENT_SETTING_ASK, - host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "")); EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string())); + host, host, CONTENT_SETTINGS_TYPE_FULLSCREEN, "")); EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string())); + host, host, CONTENT_SETTINGS_TYPE_MOUSELOCK, "")); // Check returning all hosts for a setting. ContentSettingsPattern pattern2 = @@ -165,16 +164,18 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) { std::string(), CONTENT_SETTING_BLOCK); ContentSettingsForOneType host_settings; - host_content_settings_map->GetSettingsForOneType( - CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &host_settings); + host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, + "", + &host_settings); // |host_settings| contains the default setting and an exception. EXPECT_EQ(2U, host_settings.size()); host_content_settings_map->GetSettingsForOneType( - CONTENT_SETTINGS_TYPE_PLUGINS, std::string(), &host_settings); + CONTENT_SETTINGS_TYPE_PLUGINS, "", &host_settings); // |host_settings| contains the default setting and 2 exceptions. EXPECT_EQ(3U, host_settings.size()); - host_content_settings_map->GetSettingsForOneType( - CONTENT_SETTINGS_TYPE_POPUPS, std::string(), &host_settings); + host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_POPUPS, + "", + &host_settings); // |host_settings| contains only the default setting. EXPECT_EQ(1U, host_settings.size()); } @@ -216,12 +217,13 @@ TEST_F(HostContentSettingsMapTest, Clear) { host_content_settings_map->ClearSettingsForOneType( CONTENT_SETTINGS_TYPE_IMAGES); ContentSettingsForOneType host_settings; - host_content_settings_map->GetSettingsForOneType( - CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &host_settings); + host_content_settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, + "", + &host_settings); // |host_settings| contains only the default setting. EXPECT_EQ(1U, host_settings.size()); host_content_settings_map->GetSettingsForOneType( - CONTENT_SETTINGS_TYPE_PLUGINS, std::string(), &host_settings); + CONTENT_SETTINGS_TYPE_PLUGINS, "", &host_settings); // |host_settings| contains the default setting and an exception. EXPECT_EQ(2U, host_settings.size()); } @@ -240,7 +242,7 @@ TEST_F(HostContentSettingsMapTest, Patterns) { ContentSettingsPattern::FromString("example.org"); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, "")); host_content_settings_map->SetContentSetting( pattern1, ContentSettingsPattern::Wildcard(), @@ -249,13 +251,13 @@ TEST_F(HostContentSettingsMapTest, Patterns) { CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host2, host2, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host2, host2, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, "")); host_content_settings_map->SetContentSetting( pattern2, ContentSettingsPattern::Wildcard(), @@ -264,7 +266,7 @@ TEST_F(HostContentSettingsMapTest, Patterns) { CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, "")); } TEST_F(HostContentSettingsMapTest, Observer) { @@ -325,7 +327,7 @@ TEST_F(HostContentSettingsMapTest, ObserveDefaultPref) { CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Make a copy of the pref's new value so we can reset it later. scoped_ptr<Value> new_value(prefs->FindPreference( @@ -335,13 +337,13 @@ TEST_F(HostContentSettingsMapTest, ObserveDefaultPref) { prefs->Set(prefs::kDefaultContentSettings, *default_value); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Reseting the pref to its previous value should update the cache. prefs->Set(prefs::kDefaultContentSettings, *new_value); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); } TEST_F(HostContentSettingsMapTest, ObserveExceptionPref) { @@ -361,7 +363,7 @@ TEST_F(HostContentSettingsMapTest, ObserveExceptionPref) { EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); host_content_settings_map->SetContentSetting( pattern, @@ -371,7 +373,7 @@ TEST_F(HostContentSettingsMapTest, ObserveExceptionPref) { CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Make a copy of the pref's new value so we can reset it later. scoped_ptr<Value> new_value(prefs->FindPreference( @@ -381,13 +383,13 @@ TEST_F(HostContentSettingsMapTest, ObserveExceptionPref) { prefs->Set(prefs::kContentSettingsPatternPairs, *default_value); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Reseting the pref to its previous value should update the cache. prefs->Set(prefs::kContentSettingsPatternPairs, *new_value); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); } TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) { @@ -411,26 +413,26 @@ TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) { pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_IMAGES, - std::string(), + "", CONTENT_SETTING_DEFAULT); - EXPECT_EQ( - CONTENT_SETTING_ALLOW, - host_content_settings_map->GetContentSetting(host_ending_with_dot, - host_ending_with_dot, - CONTENT_SETTINGS_TYPE_IMAGES, - std::string())); + EXPECT_EQ(CONTENT_SETTING_ALLOW, + host_content_settings_map->GetContentSetting( + host_ending_with_dot, + host_ending_with_dot, + CONTENT_SETTINGS_TYPE_IMAGES, + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_IMAGES, - std::string(), + "", CONTENT_SETTING_BLOCK); - EXPECT_EQ( - CONTENT_SETTING_BLOCK, - host_content_settings_map->GetContentSetting(host_ending_with_dot, - host_ending_with_dot, - CONTENT_SETTINGS_TYPE_IMAGES, - std::string())); + EXPECT_EQ(CONTENT_SETTING_BLOCK, + host_content_settings_map->GetContentSetting( + host_ending_with_dot, + host_ending_with_dot, + CONTENT_SETTINGS_TYPE_IMAGES, + "")); EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed( host_ending_with_dot, host_ending_with_dot)); @@ -438,7 +440,7 @@ TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) { pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_COOKIES, - std::string(), + "", CONTENT_SETTING_DEFAULT); EXPECT_TRUE(cookie_settings->IsSettingCookieAllowed( host_ending_with_dot, host_ending_with_dot)); @@ -446,7 +448,7 @@ TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) { pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_COOKIES, - std::string(), + "", CONTENT_SETTING_BLOCK); EXPECT_FALSE(cookie_settings->IsSettingCookieAllowed( host_ending_with_dot, host_ending_with_dot)); @@ -456,93 +458,93 @@ TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) { host_ending_with_dot, host_ending_with_dot, CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string())); + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string(), + "", CONTENT_SETTING_DEFAULT); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( host_ending_with_dot, host_ending_with_dot, CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string())); + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string(), + "", CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( host_ending_with_dot, host_ending_with_dot, CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string())); + "")); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( host_ending_with_dot, host_ending_with_dot, CONTENT_SETTINGS_TYPE_PLUGINS, - std::string())); + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS, - std::string(), + "", CONTENT_SETTING_DEFAULT); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( host_ending_with_dot, host_ending_with_dot, CONTENT_SETTINGS_TYPE_PLUGINS, - std::string())); + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS, - std::string(), + "", CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( host_ending_with_dot, host_ending_with_dot, CONTENT_SETTINGS_TYPE_PLUGINS, - std::string())); + "")); - EXPECT_EQ( - CONTENT_SETTING_BLOCK, - host_content_settings_map->GetContentSetting(host_ending_with_dot, - host_ending_with_dot, - CONTENT_SETTINGS_TYPE_POPUPS, - std::string())); + EXPECT_EQ(CONTENT_SETTING_BLOCK, + host_content_settings_map->GetContentSetting( + host_ending_with_dot, + host_ending_with_dot, + CONTENT_SETTINGS_TYPE_POPUPS, + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_POPUPS, - std::string(), + "", CONTENT_SETTING_DEFAULT); - EXPECT_EQ( - CONTENT_SETTING_BLOCK, - host_content_settings_map->GetContentSetting(host_ending_with_dot, - host_ending_with_dot, - CONTENT_SETTINGS_TYPE_POPUPS, - std::string())); + EXPECT_EQ(CONTENT_SETTING_BLOCK, + host_content_settings_map->GetContentSetting( + host_ending_with_dot, + host_ending_with_dot, + CONTENT_SETTINGS_TYPE_POPUPS, + "")); host_content_settings_map->SetContentSetting( pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_POPUPS, - std::string(), + "", CONTENT_SETTING_ALLOW); - EXPECT_EQ( - CONTENT_SETTING_ALLOW, - host_content_settings_map->GetContentSetting(host_ending_with_dot, - host_ending_with_dot, - CONTENT_SETTINGS_TYPE_POPUPS, - std::string())); + EXPECT_EQ(CONTENT_SETTING_ALLOW, + host_content_settings_map->GetContentSetting( + host_ending_with_dot, + host_ending_with_dot, + CONTENT_SETTINGS_TYPE_POPUPS, + "")); } TEST_F(HostContentSettingsMapTest, NestedSettings) { @@ -562,53 +564,52 @@ TEST_F(HostContentSettingsMapTest, NestedSettings) { pattern1, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_IMAGES, - std::string(), + "", CONTENT_SETTING_BLOCK); host_content_settings_map->SetContentSetting( pattern2, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_COOKIES, - std::string(), + "", CONTENT_SETTING_BLOCK); host_content_settings_map->SetContentSetting( pattern3, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_PLUGINS, - std::string(), + "", CONTENT_SETTING_BLOCK); host_content_settings_map->SetDefaultContentSetting( CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_COOKIES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_COOKIES, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_PLUGINS, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_POPUPS, "")); EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); - EXPECT_EQ( - CONTENT_SETTING_ASK, - host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_GEOLOCATION, "")); EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string())); + host, host, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "")); EXPECT_EQ(CONTENT_SETTING_ASK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string())); + host, host, CONTENT_SETTINGS_TYPE_FULLSCREEN, "")); + EXPECT_EQ(CONTENT_SETTING_ASK, + host_content_settings_map->GetContentSetting( + host, host, CONTENT_SETTINGS_TYPE_MOUSELOCK, "")); } TEST_F(HostContentSettingsMapTest, OffTheRecord) { @@ -625,10 +626,10 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) { EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_ALLOW, otr_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Changing content settings on the main map should also affect the // incognito map. @@ -636,28 +637,27 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) { pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_IMAGES, - std::string(), + "", CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_BLOCK, otr_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); // Changing content settings on the incognito map should NOT affect the // main map. - otr_map->SetContentSetting(pattern, - ContentSettingsPattern::Wildcard(), - CONTENT_SETTINGS_TYPE_IMAGES, - std::string(), - CONTENT_SETTING_ALLOW); + otr_map->SetContentSetting( + pattern, + ContentSettingsPattern::Wildcard(), + CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_ALLOW); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_ALLOW, otr_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); otr_map->ShutdownOnUIThread(); } @@ -738,7 +738,7 @@ TEST_F(HostContentSettingsMapTest, ResourceIdentifier) { CONTENT_SETTINGS_TYPE_PLUGINS, NULL); EXPECT_EQ(default_plugin_setting, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_PLUGINS, std::string())); + host, host, CONTENT_SETTINGS_TYPE_PLUGINS, "")); // If no resource-specific content settings are defined, the setting should be // DEFAULT. @@ -865,7 +865,7 @@ TEST_F(HostContentSettingsMapTest, pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string(), + "", CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_ALLOW, @@ -875,14 +875,14 @@ TEST_F(HostContentSettingsMapTest, GURL host("http://example.com/"); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); // Set managed-default-content-setting for content-settings-type JavaScript. prefs->SetManagedPref(prefs::kManagedDefaultJavaScriptSetting, Value::CreateIntegerValue(CONTENT_SETTING_ALLOW)); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); } // Managed default content setting should have higher priority @@ -906,7 +906,7 @@ TEST_F(HostContentSettingsMapTest, pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_JAVASCRIPT, - std::string(), + "", CONTENT_SETTING_ALLOW); EXPECT_EQ(CONTENT_SETTING_BLOCK, @@ -915,20 +915,20 @@ TEST_F(HostContentSettingsMapTest, GURL host("http://example.com/"); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); // Set managed-default-content-settings-preferences. prefs->SetManagedPref(prefs::kManagedDefaultJavaScriptSetting, Value::CreateIntegerValue(CONTENT_SETTING_BLOCK)); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); // Remove managed-default-content-settings-preferences. prefs->RemoveManagedPref(prefs::kManagedDefaultJavaScriptSetting); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string())); + host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, "")); } // If a default-content-setting is set to managed setting, the user defined @@ -1004,10 +1004,10 @@ TEST_F(HostContentSettingsMapTest, GetContentSetting) { CONTENT_SETTING_BLOCK); EXPECT_EQ(CONTENT_SETTING_BLOCK, host_content_settings_map->GetContentSetting( - host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + host, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); EXPECT_EQ(CONTENT_SETTING_ALLOW, host_content_settings_map->GetContentSetting( - embedder, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string())); + embedder, host, CONTENT_SETTINGS_TYPE_IMAGES, "")); } TEST_F(HostContentSettingsMapTest, ShouldAllowAllContent) { |