more changes

chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc

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 8a2e3237e8d5a12779a3d4fc8ba35f64df1dd2fe..c2e51165ad5911cb9eb94131f939feaed20cca2a 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
@@ -21,9 +21,9 @@ TEST(OriginIdentifierValueMapTest, SetGetValue) {
       ContentSettingsPattern::FromString("[*.]google.com"),
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
-      Value::CreateIntegerValue(1));
+      base::NumberValue::New(1));
 
-  scoped_ptr<Value> expected_value(Value::CreateIntegerValue(1));
+  scoped_ptr<Value> expected_value(base::NumberValue::New(1));
   EXPECT_TRUE(expected_value->Equals(
       map.GetValue(GURL("http://www.google.com"),
                    GURL("http://www.google.com"),
@@ -65,7 +65,7 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {
       ContentSettingsPattern::FromString("[*.]google.com"),
       CONTENT_SETTINGS_TYPE_PLUGINS,
       "java-plugin",
-      Value::CreateIntegerValue(1));
+      base::NumberValue::New(1));
 
   int actual_value;
   EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"),
@@ -116,13 +116,13 @@ TEST(OriginIdentifierValueMapTest, Clear) {
       ContentSettingsPattern::FromString("[*.]google.com"),
       CONTENT_SETTINGS_TYPE_PLUGINS,
       "java-plugin",
-      Value::CreateIntegerValue(1));
+      base::NumberValue::New(1));
   map.SetValue(
       ContentSettingsPattern::FromString("[*.]google.com"),
       ContentSettingsPattern::FromString("[*.]google.com"),
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
-      Value::CreateIntegerValue(1));
+      base::NumberValue::New(1));
   EXPECT_NE(map.begin(), map.end());
   int actual_value;
   EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"),
@@ -148,14 +148,14 @@ TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) {
       ContentSettingsPattern::FromString("[*.]google.com"),
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
-      Value::CreateIntegerValue(1));
+      base::NumberValue::New(1));
 
   map.SetValue(
       ContentSettingsPattern::FromString("www.google.com"),
       ContentSettingsPattern::FromString("[*.]google.com"),
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
-      Value::CreateIntegerValue(2));
+      base::NumberValue::New(2));
 
   int actual_value;
   EXPECT_TRUE(map.GetValue(GURL("http://mail.google.com"),