| 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 84b2b2a2e00603ef8141bf857e24afec43e68318..f2c60c4f9ed415b462c7221950da06f418a2272e 100644
|
| --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
|
| @@ -729,7 +729,7 @@ TEST_F(HostContentSettingsMapTest, ManagedDefaultContentSetting) {
|
|
|
| // Set managed-default-content-setting through the coresponding preferences.
|
| prefs->SetManagedPref(prefs::kManagedDefaultJavaScriptSetting,
|
| - base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| host_content_settings_map->GetDefaultContentSetting(
|
| CONTENT_SETTINGS_TYPE_JAVASCRIPT, NULL));
|
| @@ -742,7 +742,7 @@ TEST_F(HostContentSettingsMapTest, ManagedDefaultContentSetting) {
|
|
|
| // Set preference to manage the default-content-setting for Plugins.
|
| prefs->SetManagedPref(prefs::kManagedDefaultPluginsSetting,
|
| - base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| host_content_settings_map->GetDefaultContentSetting(
|
| CONTENT_SETTINGS_TYPE_PLUGINS, NULL));
|
| @@ -782,7 +782,7 @@ TEST_F(HostContentSettingsMapTest,
|
|
|
| // Set managed-default-content-setting for content-settings-type JavaScript.
|
| prefs->SetManagedPref(prefs::kManagedDefaultJavaScriptSetting,
|
| - base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
|
| + new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| host_content_settings_map->GetContentSetting(
|
| host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));
|
| @@ -822,7 +822,7 @@ TEST_F(HostContentSettingsMapTest,
|
|
|
| // Set managed-default-content-settings-preferences.
|
| prefs->SetManagedPref(prefs::kManagedDefaultJavaScriptSetting,
|
| - base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
|
| + new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| host_content_settings_map->GetContentSetting(
|
| host, host, CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string()));
|
| @@ -851,7 +851,7 @@ TEST_F(HostContentSettingsMapTest, OverwrittenDefaultContentSetting) {
|
|
|
| // Set preference to manage the default-content-setting for Cookies.
|
| prefs->SetManagedPref(prefs::kManagedDefaultCookiesSetting,
|
| - base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
|
| + new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| host_content_settings_map->GetDefaultContentSetting(
|
| CONTENT_SETTINGS_TYPE_COOKIES, NULL));
|
| @@ -873,7 +873,7 @@ TEST_F(HostContentSettingsMapTest, SettingDefaultContentSettingsWhenManaged) {
|
| TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();
|
|
|
| prefs->SetManagedPref(prefs::kManagedDefaultPluginsSetting,
|
| - base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
|
| + new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| EXPECT_EQ(CONTENT_SETTING_ALLOW,
|
| host_content_settings_map->GetDefaultContentSetting(
|
| CONTENT_SETTINGS_TYPE_PLUGINS, NULL));
|
|
|