Index: chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc |
diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc |
index 5c56b1ccb70118ac3e84e904d6f14d608ada502d..554a29cb1ae92dbde5ad9c685f8f5a2d785dec39 100644 |
--- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc |
+++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc |
@@ -24,9 +24,9 @@ TEST(OriginIdentifierValueMapTest, SetGetValue) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(1)); |
+ new base::Value(1)); |
- std::unique_ptr<base::Value> expected_value(new base::FundamentalValue(1)); |
+ std::unique_ptr<base::Value> expected_value(new base::Value(1)); |
EXPECT_TRUE(expected_value->Equals(map.GetValue(GURL("http://www.google.com"), |
GURL("http://www.google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
@@ -69,7 +69,7 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_PLUGINS, |
"java-plugin", |
- new base::FundamentalValue(1)); |
+ new base::Value(1)); |
int actual_value; |
EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"), |
@@ -119,12 +119,12 @@ TEST(OriginIdentifierValueMapTest, Clear) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_PLUGINS, |
"java-plugin", |
- new base::FundamentalValue(1)); |
+ new base::Value(1)); |
map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"), |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(1)); |
+ new base::Value(1)); |
EXPECT_FALSE(map.empty()); |
int actual_value; |
EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"), |
@@ -149,13 +149,13 @@ TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(1)); |
+ new base::Value(1)); |
map.SetValue(ContentSettingsPattern::FromString("www.google.com"), |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(2)); |
+ new base::Value(2)); |
int actual_value; |
EXPECT_TRUE(map.GetValue(GURL("http://mail.google.com"), |
@@ -190,12 +190,12 @@ TEST(OriginIdentifierValueMapTest, IterateNonempty) { |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(1)); |
+ new base::Value(1)); |
map.SetValue(sub_pattern, |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- new base::FundamentalValue(2)); |
+ new base::Value(2)); |
std::unique_ptr<content_settings::RuleIterator> rule_iterator( |
map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, std::string(), NULL)); |