more changes

chrome/browser/prefs/pref_value_map_unittest.cc

Index: chrome/browser/prefs/pref_value_map_unittest.cc
diff --git a/chrome/browser/prefs/pref_value_map_unittest.cc b/chrome/browser/prefs/pref_value_map_unittest.cc
index 08aa57851550ec8bd59e2729cef0a70a7f62aa7c..d0198b77086fdc5b1d7b52f8ec5e027abc5d012b 100644
--- a/chrome/browser/prefs/pref_value_map_unittest.cc
+++ b/chrome/browser/prefs/pref_value_map_unittest.cc
@@ -15,9 +15,9 @@ TEST_F(PrefValueMapTest, SetValue) {
   EXPECT_FALSE(map.GetValue("key", &result));
   EXPECT_FALSE(result);
 
-  EXPECT_TRUE(map.SetValue("key", Value::CreateStringValue("test")));
-  EXPECT_FALSE(map.SetValue("key", Value::CreateStringValue("test")));
-  EXPECT_TRUE(map.SetValue("key", Value::CreateStringValue("hi mom!")));
+  EXPECT_TRUE(map.SetValue("key", base::StringValue::New("test")));
+  EXPECT_FALSE(map.SetValue("key", base::StringValue::New("test")));
+  EXPECT_TRUE(map.SetValue("key", base::StringValue::New("hi mom!")));
 
   EXPECT_TRUE(map.GetValue("key", &result));
   EXPECT_TRUE(StringValue("hi mom!").Equals(result));
@@ -25,7 +25,7 @@ TEST_F(PrefValueMapTest, SetValue) {
 
 TEST_F(PrefValueMapTest, GetAndSetIntegerValue) {
   PrefValueMap map;
-  ASSERT_TRUE(map.SetValue("key", Value::CreateIntegerValue(5)));
+  ASSERT_TRUE(map.SetValue("key", base::NumberValue::New(5)));
 
   int int_value = 0;
   EXPECT_TRUE(map.GetInteger("key", &int_value));
@@ -40,7 +40,7 @@ TEST_F(PrefValueMapTest, RemoveValue) {
   PrefValueMap map;
   EXPECT_FALSE(map.RemoveValue("key"));
 
-  EXPECT_TRUE(map.SetValue("key", Value::CreateStringValue("test")));
+  EXPECT_TRUE(map.SetValue("key", base::StringValue::New("test")));
   EXPECT_TRUE(map.GetValue("key", NULL));
 
   EXPECT_TRUE(map.RemoveValue("key"));
@@ -51,7 +51,7 @@ TEST_F(PrefValueMapTest, RemoveValue) {
 
 TEST_F(PrefValueMapTest, Clear) {
   PrefValueMap map;
-  EXPECT_TRUE(map.SetValue("key", Value::CreateStringValue("test")));
+  EXPECT_TRUE(map.SetValue("key", base::StringValue::New("test")));
   EXPECT_TRUE(map.GetValue("key", NULL));
 
   map.Clear();
@@ -61,9 +61,9 @@ TEST_F(PrefValueMapTest, Clear) {
 
 TEST_F(PrefValueMapTest, GetDifferingKeys) {
   PrefValueMap reference;
-  EXPECT_TRUE(reference.SetValue("b", Value::CreateStringValue("test")));
-  EXPECT_TRUE(reference.SetValue("c", Value::CreateStringValue("test")));
-  EXPECT_TRUE(reference.SetValue("e", Value::CreateStringValue("test")));
+  EXPECT_TRUE(reference.SetValue("b", base::StringValue::New("test")));
+  EXPECT_TRUE(reference.SetValue("c", base::StringValue::New("test")));
+  EXPECT_TRUE(reference.SetValue("e", base::StringValue::New("test")));
 
   PrefValueMap check;
   std::vector<std::string> differing_paths;
@@ -75,9 +75,9 @@ TEST_F(PrefValueMapTest, GetDifferingKeys) {
   expected_differing_paths.push_back("e");
   EXPECT_EQ(expected_differing_paths, differing_paths);
 
-  EXPECT_TRUE(check.SetValue("a", Value::CreateStringValue("test")));
-  EXPECT_TRUE(check.SetValue("c", Value::CreateStringValue("test")));
-  EXPECT_TRUE(check.SetValue("d", Value::CreateStringValue("test")));
+  EXPECT_TRUE(check.SetValue("a", base::StringValue::New("test")));
+  EXPECT_TRUE(check.SetValue("c", base::StringValue::New("test")));
+  EXPECT_TRUE(check.SetValue("d", base::StringValue::New("test")));
 
   reference.GetDifferingKeys(&check, &differing_paths);
   expected_differing_paths.clear();