more changes

chrome/browser/prefs/pref_service.cc

Index: chrome/browser/prefs/pref_service.cc
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 6cb98364ed38ee4d05345c2c50f46859adb20509..fe8bd527feeb463dfa40077bf556689deacd6d5b 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -46,26 +46,26 @@ Value* CreateLocaleDefaultValue(base::Value::Type type, int message_id) {
   switch (type) {
     case Value::TYPE_BOOLEAN: {
       if ("true" == resource_string)
-        return Value::CreateBooleanValue(true);
+        return base::TrueValue();
       if ("false" == resource_string)
-        return Value::CreateBooleanValue(false);
+        return base::FalseValue();
       break;
     }
 
     case Value::TYPE_INTEGER: {
       int val;
       base::StringToInt(resource_string, &val);
-      return Value::CreateIntegerValue(val);
+      return base::NumberValue::New(val);
     }
 
     case Value::TYPE_DOUBLE: {
       double val;
       base::StringToDouble(resource_string, &val);
-      return Value::CreateDoubleValue(val);
+      return base::NumberValue::New(val);
     }
 
     case Value::TYPE_STRING: {
-      return Value::CreateStringValue(resource_string);
+      return base::StringValue::New(resource_string);
     }
 
     default: {
@@ -74,7 +74,7 @@ Value* CreateLocaleDefaultValue(base::Value::Type type, int message_id) {
     }
   }
   NOTREACHED();
-  return Value::CreateNullValue();
+  return base::NullValue();
 }
 
 // Forwards a notification after a PostMessage so that we can wait for the
@@ -282,7 +282,7 @@ void PrefService::RegisterBooleanPref(const char* path,
   // sync status must be provided (see profile pref registration calls below).
   DCHECK(IsLocalStatePrefService(this));
   RegisterPreference(path,
-                     Value::CreateBooleanValue(default_value),
+                     base::BooleanValue::New(default_value),
                      UNSYNCABLE_PREF);
 }
 
@@ -291,7 +291,7 @@ void PrefService::RegisterIntegerPref(const char* path, int default_value) {
   // sync status must be provided (see profile pref registration calls below).
   DCHECK(IsLocalStatePrefService(this));
   RegisterPreference(path,
-                     Value::CreateIntegerValue(default_value),
+                     base::NumberValue::New(default_value),
                      UNSYNCABLE_PREF);
 }
 
@@ -300,7 +300,7 @@ void PrefService::RegisterDoublePref(const char* path, double default_value) {
   // sync status must be provided (see profile pref registration calls below).
   DCHECK(IsLocalStatePrefService(this));
   RegisterPreference(path,
-                     Value::CreateDoubleValue(default_value),
+                     base::NumberValue::New(default_value),
                      UNSYNCABLE_PREF);
 }
 
@@ -310,7 +310,7 @@ void PrefService::RegisterStringPref(const char* path,
   // sync status must be provided (see profile pref registration calls below).
   DCHECK(IsLocalStatePrefService(this));
   RegisterPreference(path,
-                     Value::CreateStringValue(default_value),
+                     base::StringValue::New(default_value),
                      UNSYNCABLE_PREF);
 }
 
@@ -320,7 +320,7 @@ void PrefService::RegisterFilePathPref(const char* path,
   // sync status must be provided (see profile pref registration calls below).
   DCHECK(IsLocalStatePrefService(this));
   RegisterPreference(path,
-                     Value::CreateStringValue(default_value.value()),
+                     base::StringValue::New(default_value.value()),
                      UNSYNCABLE_PREF);
 }
 
@@ -411,7 +411,7 @@ void PrefService::RegisterInt64Pref(const char* path, int64 default_value) {
   DCHECK(IsLocalStatePrefService(this));
   RegisterPreference(
       path,
-      Value::CreateStringValue(base::Int64ToString(default_value)),
+      base::StringValue::New(base::Int64ToString(default_value)),
       UNSYNCABLE_PREF);
 }
 
@@ -421,7 +421,7 @@ void PrefService::RegisterBooleanPref(const char* path,
                                       PrefSyncStatus sync_status) {
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(path,
-                     Value::CreateBooleanValue(default_value),
+                     base::BooleanValue::New(default_value),
                      sync_status);
 }
 
@@ -430,7 +430,7 @@ void PrefService::RegisterIntegerPref(const char* path,
                                       PrefSyncStatus sync_status) {
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(path,
-                     Value::CreateIntegerValue(default_value),
+                     base::NumberValue::New(default_value),
                      sync_status);
 }
 
@@ -439,7 +439,7 @@ void PrefService::RegisterDoublePref(const char* path,
                                      PrefSyncStatus sync_status) {
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(path,
-                     Value::CreateDoubleValue(default_value),
+                     base::NumberValue::New(default_value),
                      sync_status);
 }
 
@@ -448,7 +448,7 @@ void PrefService::RegisterStringPref(const char* path,
                                      PrefSyncStatus sync_status) {
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(path,
-                     Value::CreateStringValue(default_value),
+                     base::StringValue::New(default_value),
                      sync_status);
 }
 
@@ -457,7 +457,7 @@ void PrefService::RegisterFilePathPref(const char* path,
                                        PrefSyncStatus sync_status) {
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(path,
-                     Value::CreateStringValue(default_value.value()),
+                     base::StringValue::New(default_value.value()),
                      sync_status);
 }
 
@@ -533,7 +533,7 @@ void PrefService::RegisterInt64Pref(const char* path,
   DCHECK(IsProfilePrefService(this));
   RegisterPreference(
       path,
-      Value::CreateStringValue(base::Int64ToString(default_value)),
+      base::StringValue::New(base::Int64ToString(default_value)),
       sync_status);
 }
 
@@ -738,19 +738,19 @@ void PrefService::Set(const char* path, const Value& value) {
 }
 
 void PrefService::SetBoolean(const char* path, bool value) {
-  SetUserPrefValue(path, Value::CreateBooleanValue(value));
+  SetUserPrefValue(path, base::BooleanValue::New(value));
 }
 
 void PrefService::SetInteger(const char* path, int value) {
-  SetUserPrefValue(path, Value::CreateIntegerValue(value));
+  SetUserPrefValue(path, base::NumberValue::New(value));
 }
 
 void PrefService::SetDouble(const char* path, double value) {
-  SetUserPrefValue(path, Value::CreateDoubleValue(value));
+  SetUserPrefValue(path, base::NumberValue::New(value));
 }
 
 void PrefService::SetString(const char* path, const std::string& value) {
-  SetUserPrefValue(path, Value::CreateStringValue(value));
+  SetUserPrefValue(path, base::StringValue::New(value));
 }
 
 void PrefService::SetFilePath(const char* path, const FilePath& value) {
@@ -758,7 +758,7 @@ void PrefService::SetFilePath(const char* path, const FilePath& value) {
 }
 
 void PrefService::SetInt64(const char* path, int64 value) {
-  SetUserPrefValue(path, Value::CreateStringValue(base::Int64ToString(value)));
+  SetUserPrefValue(path, base::StringValue::New(base::Int64ToString(value)));
 }
 
 int64 PrefService::GetInt64(const char* path) const {