| Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| index 829f061c67d8a5eec14d2ea3f3899dfc0a538080..4d9ea832127238589c61049cb6122dbd4a8a0e2b 100644
|
| --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
|
| @@ -127,7 +127,7 @@ TEST_F(PrefProviderTest, Observer) {
|
| pref_content_settings_provider.SetWebsiteSetting(
|
| pattern, ContentSettingsPattern::Wildcard(),
|
| CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
|
| - new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| + new base::Value(CONTENT_SETTING_ALLOW));
|
|
|
| pref_content_settings_provider.ShutdownOnUIThread();
|
| }
|
| @@ -216,7 +216,7 @@ TEST_F(PrefProviderTest, Incognito) {
|
| ContentSettingsPattern::FromString("[*.]example.com");
|
| pref_content_settings_provider.SetWebsiteSetting(
|
| pattern, pattern, CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
|
| - new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| + new base::Value(CONTENT_SETTING_ALLOW));
|
|
|
| GURL host("http://example.com/");
|
| // The value should of course be visible in the regular PrefProvider.
|
| @@ -257,7 +257,7 @@ TEST_F(PrefProviderTest, GetContentSettingsValue) {
|
|
|
| provider.SetWebsiteSetting(primary_pattern, primary_pattern,
|
| CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
|
| - new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| + new base::Value(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| TestUtils::GetContentSetting(&provider, primary_url, primary_url,
|
| CONTENT_SETTINGS_TYPE_COOKIES,
|
| @@ -300,7 +300,7 @@ TEST_F(PrefProviderTest, Patterns) {
|
| std::string(), false));
|
| pref_content_settings_provider.SetWebsiteSetting(
|
| pattern1, pattern1, CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
|
| - new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| + new base::Value(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| TestUtils::GetContentSetting(&pref_content_settings_provider, host1,
|
| host1, CONTENT_SETTINGS_TYPE_COOKIES,
|
| @@ -316,7 +316,7 @@ TEST_F(PrefProviderTest, Patterns) {
|
| std::string(), false));
|
| pref_content_settings_provider.SetWebsiteSetting(
|
| pattern2, pattern2, CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
|
| - new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| + new base::Value(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| TestUtils::GetContentSetting(&pref_content_settings_provider, host3,
|
| host3, CONTENT_SETTINGS_TYPE_COOKIES,
|
| @@ -328,7 +328,7 @@ TEST_F(PrefProviderTest, Patterns) {
|
| std::string(), false));
|
| pref_content_settings_provider.SetWebsiteSetting(
|
| pattern3, pattern3, CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
|
| - new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| + new base::Value(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| TestUtils::GetContentSetting(&pref_content_settings_provider, host4,
|
| host4, CONTENT_SETTINGS_TYPE_COOKIES,
|
| @@ -358,7 +358,7 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {
|
| pattern,
|
| CONTENT_SETTINGS_TYPE_PLUGINS,
|
| resource1,
|
| - new base::FundamentalValue(CONTENT_SETTING_BLOCK));
|
| + new base::Value(CONTENT_SETTING_BLOCK));
|
| EXPECT_EQ(CONTENT_SETTING_BLOCK,
|
| TestUtils::GetContentSetting(&pref_content_settings_provider, host,
|
| host, CONTENT_SETTINGS_TYPE_PLUGINS,
|
| @@ -443,7 +443,7 @@ TEST_F(PrefProviderTest, IncognitoInheritsValueMap) {
|
| ContentSettingsPattern wildcard =
|
| ContentSettingsPattern::FromString("*");
|
| std::unique_ptr<base::Value> value(
|
| - new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| + new base::Value(CONTENT_SETTING_ALLOW));
|
|
|
| // Create a normal provider and set a setting.
|
| PrefProvider normal_provider(&prefs, false);
|
| @@ -504,7 +504,7 @@ TEST_F(PrefProviderTest, ClearAllContentSettingsRules) {
|
| ContentSettingsPattern wildcard =
|
| ContentSettingsPattern::FromString("*");
|
| std::unique_ptr<base::Value> value(
|
| - new base::FundamentalValue(CONTENT_SETTING_ALLOW));
|
| + new base::Value(CONTENT_SETTING_ALLOW));
|
| ResourceIdentifier res_id("abcde");
|
|
|
| PrefProvider provider(&prefs, false);
|
|
|