Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(902)

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 65d486fe9362526adbf09450cba069714213d043..35aba5250ea6151541522add1e1e733eefba5c3a 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -128,7 +128,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();
}
@@ -279,7 +279,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.
@@ -320,7 +320,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,
@@ -363,7 +363,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,
@@ -379,7 +379,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,
@@ -391,7 +391,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,
@@ -417,11 +417,8 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {
host, CONTENT_SETTINGS_TYPE_PLUGINS,
resource1, false));
pref_content_settings_provider.SetWebsiteSetting(
- pattern,
- pattern,
- CONTENT_SETTINGS_TYPE_PLUGINS,
- resource1,
- new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+ pattern, pattern, CONTENT_SETTINGS_TYPE_PLUGINS, resource1,
+ new base::Value(CONTENT_SETTING_BLOCK));
EXPECT_EQ(CONTENT_SETTING_BLOCK,
TestUtils::GetContentSetting(&pref_content_settings_provider, host,
host, CONTENT_SETTINGS_TYPE_PLUGINS,
@@ -470,8 +467,7 @@ TEST_F(PrefProviderTest, IncognitoInheritsValueMap) {
ContentSettingsPattern::FromString("www.google.com");
ContentSettingsPattern wildcard =
ContentSettingsPattern::FromString("*");
- std::unique_ptr<base::Value> value(
- new base::FundamentalValue(CONTENT_SETTING_ALLOW));
+ std::unique_ptr<base::Value> value(new base::Value(CONTENT_SETTING_ALLOW));
// Create a normal provider and set a setting.
PrefProvider normal_provider(&prefs, false);
@@ -531,8 +527,7 @@ TEST_F(PrefProviderTest, ClearAllContentSettingsRules) {
ContentSettingsPattern::FromString("google.com");
ContentSettingsPattern wildcard =
ContentSettingsPattern::FromString("*");
- std::unique_ptr<base::Value> value(
- new base::FundamentalValue(CONTENT_SETTING_ALLOW));
+ std::unique_ptr<base::Value> value(new base::Value(CONTENT_SETTING_ALLOW));
ResourceIdentifier res_id("abcde");
PrefProvider provider(&prefs, false);

Powered by Google App Engine
This is Rietveld 408576698