more changes

chrome/browser/prefs/pref_service_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
@@ skipping 92 matching lines @@
 
   // Set a value and make sure we have a path.
   prefs.SetString(path, "blah");
   EXPECT_TRUE(prefs.HasPrefPath(path));
 }
 
 TEST(PrefServiceTest, Observers) {
   const char pref_name[] = "homepage";
 
   TestingPrefService prefs;
-  prefs.SetUserPref(pref_name, Value::CreateStringValue("http://www.cnn.com"));
+  prefs.SetUserPref(pref_name, base::StringValue::New("http://www.cnn.com"));
   prefs.RegisterStringPref(pref_name, std::string());
 
   const char new_pref_value[] = "http://www.google.com/";
   const StringValue expected_new_pref_value(new_pref_value);
   PrefObserverMock obs;
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs);
   registrar.Add(pref_name, &obs);
 
   // This should fire the checks in PrefObserverMock::Observe.
@@ skipping 25 matching lines @@
 
 // Make sure that if a preference changes type, so the wrong type is stored in
 // the user pref file, it uses the correct fallback value instead.
 TEST(PrefServiceTest, GetValueChangedType) {
   const int kTestValue = 10;
   TestingPrefService prefs;
   prefs.RegisterIntegerPref(prefs::kStabilityLaunchCount, kTestValue);
 
   // Check falling back to a recommended value.
   prefs.SetUserPref(prefs::kStabilityLaunchCount,
-                    Value::CreateStringValue("not an integer"));
+                    base::StringValue::New("not an integer"));
   const PrefService::Preference* pref =
       prefs.FindPreference(prefs::kStabilityLaunchCount);
   ASSERT_TRUE(pref);
   const Value* value = pref->GetValue();
   ASSERT_TRUE(value);
   EXPECT_EQ(Value::TYPE_INTEGER, value->GetType());
   int actual_int_value = -1;
   EXPECT_TRUE(value->GetAsInteger(&actual_int_value));
   EXPECT_EQ(kTestValue, actual_int_value);
 }
@@ skipping 64 matching lines @@
   prefs_.RegisterListPref(kName);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs_);
   registrar.Add(kName, &observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.RemoveUserPref(kName);
   Mock::VerifyAndClearExpectations(&observer_);
 
   ListValue new_value;
-  new_value.Append(Value::CreateStringValue(kValue));
+  new_value.Append(base::StringValue::New(kValue));
   observer_.Expect(&prefs_, kName, &new_value);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, Observe(_, _, _)).Times(0);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
   ListValue empty;
   observer_.Expect(&prefs_, kName, &empty);
   prefs_.Set(kName, empty);
   Mock::VerifyAndClearExpectations(&observer_);
 }