Index: chrome/browser/content_settings/content_settings_default_provider_unittest.cc |
diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc |
index da06595ea4811b3f43f7c52c0d6c88ec69725b38..971814270142212ab12108e884ed536d82968e7b 100644 |
--- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc |
+++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc |
@@ -48,7 +48,7 @@ TEST_F(DefaultProviderTest, DefaultValues) { |
ContentSettingsPattern::Wildcard(), |
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_, GURL(), GURL(), |
CONTENT_SETTINGS_TYPE_COOKIES, |
@@ -63,7 +63,7 @@ TEST_F(DefaultProviderTest, DefaultValues) { |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_GEOLOCATION, |
std::string(), |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ new base::Value(CONTENT_SETTING_BLOCK)); |
EXPECT_EQ(CONTENT_SETTING_BLOCK, |
TestUtils::GetContentSetting(&provider_, GURL(), GURL(), |
CONTENT_SETTINGS_TYPE_GEOLOCATION, |
@@ -84,7 +84,7 @@ TEST_F(DefaultProviderTest, IgnoreNonDefaultSettings) { |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), false)); |
std::unique_ptr<base::Value> value( |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ new base::Value(CONTENT_SETTING_BLOCK)); |
bool owned = provider_.SetWebsiteSetting( |
ContentSettingsPattern::FromURL(primary_url), |
ContentSettingsPattern::FromURL(secondary_url), |
@@ -109,7 +109,7 @@ TEST_F(DefaultProviderTest, Observer) { |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ new base::Value(CONTENT_SETTING_BLOCK)); |
EXPECT_CALL(mock_observer, |
OnContentSettingChanged( |
@@ -119,7 +119,7 @@ TEST_F(DefaultProviderTest, Observer) { |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_GEOLOCATION, |
std::string(), |
- new base::FundamentalValue(CONTENT_SETTING_BLOCK)); |
+ new base::Value(CONTENT_SETTING_BLOCK)); |
} |
@@ -131,7 +131,7 @@ TEST_F(DefaultProviderTest, ObservePref) { |
ContentSettingsPattern::Wildcard(), |
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_, GURL(), GURL(), |
CONTENT_SETTINGS_TYPE_COOKIES, |
@@ -203,7 +203,7 @@ TEST_F(DefaultProviderTest, OffTheRecord) { |
ContentSettingsPattern::Wildcard(), |
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_, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES, |
@@ -216,7 +216,7 @@ TEST_F(DefaultProviderTest, OffTheRecord) { |
// Changing content settings on the incognito provider should be ignored. |
std::unique_ptr<base::Value> value( |
- new base::FundamentalValue(CONTENT_SETTING_ALLOW)); |
+ new base::Value(CONTENT_SETTING_ALLOW)); |
bool owned = otr_provider.SetWebsiteSetting( |
ContentSettingsPattern::Wildcard(), |
ContentSettingsPattern::Wildcard(), |