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 aad03fac1e2f3a0d1d5b3a468343c423523ebd6f..5897ad934ac833654b4b3ae89e62788325a2884d 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 |
@@ -23,9 +23,9 @@ TEST(OriginIdentifierValueMapTest, SetGetValue) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- Value::CreateIntegerValue(1)); |
+ base::Value::CreateIntegerValue(1)); |
- scoped_ptr<Value> expected_value(Value::CreateIntegerValue(1)); |
+ scoped_ptr<base::Value> expected_value(base::Value::CreateIntegerValue(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", |
- Value::CreateIntegerValue(1)); |
+ base::Value::CreateIntegerValue(1)); |
int actual_value; |
EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"), |
@@ -120,12 +120,12 @@ TEST(OriginIdentifierValueMapTest, Clear) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_PLUGINS, |
"java-plugin", |
- Value::CreateIntegerValue(1)); |
+ base::Value::CreateIntegerValue(1)); |
map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"), |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- Value::CreateIntegerValue(1)); |
+ base::Value::CreateIntegerValue(1)); |
EXPECT_FALSE(map.empty()); |
int actual_value; |
EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"), |
@@ -150,13 +150,13 @@ TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) { |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- Value::CreateIntegerValue(1)); |
+ base::Value::CreateIntegerValue(1)); |
map.SetValue(ContentSettingsPattern::FromString("www.google.com"), |
ContentSettingsPattern::FromString("[*.]google.com"), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- Value::CreateIntegerValue(2)); |
+ base::Value::CreateIntegerValue(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(), |
- Value::CreateIntegerValue(1)); |
+ base::Value::CreateIntegerValue(1)); |
map.SetValue(sub_pattern, |
ContentSettingsPattern::Wildcard(), |
CONTENT_SETTINGS_TYPE_COOKIES, |
std::string(), |
- Value::CreateIntegerValue(2)); |
+ base::Value::CreateIntegerValue(2)); |
scoped_ptr<content_settings::RuleIterator> rule_iterator( |
map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, std::string(), NULL)); |