more changes

chrome/browser/policy/configuration_policy_pref_store.cc

Index: chrome/browser/policy/configuration_policy_pref_store.cc
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index 7c52f5a6a9dd0260063923a82900eb9d0c0bf1d7..ceba3baf30509a49f5e03730ce3446ed7c4de764 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -443,8 +443,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyAutofillPolicy(
   if (policy == kPolicyAutoFillEnabled) {
     bool auto_fill_enabled;
     if (value->GetAsBoolean(&auto_fill_enabled) && !auto_fill_enabled)
-      prefs_.SetValue(prefs::kAutofillEnabled,
-                       Value::CreateBooleanValue(false));
+      prefs_.SetValue(prefs::kAutofillEnabled, base::FalseValue());
     delete value;
     return true;
   }
@@ -466,9 +465,8 @@ bool ConfigurationPolicyPrefKeeper::ApplyDownloadDirPolicy(
     FilePath::StringType expanded_value =
         policy::path_parser::ExpandPathVariables(string_value);
     prefs_.SetValue(prefs::kDownloadDefaultDirectory,
-                    Value::CreateStringValue(expanded_value));
-    prefs_.SetValue(prefs::kPromptForDownload,
-                    Value::CreateBooleanValue(false));
+                    base::StringValue::New(expanded_value));
+    prefs_.SetValue(prefs::kPromptForDownload, base::FalseValue());
 #endif  // !defined(OS_CHROMEOS)
     delete value;
     return true;
@@ -489,7 +487,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyDiskCacheDirPolicy(
     FilePath::StringType expanded_value =
         policy::path_parser::ExpandPathVariables(string_value);
     prefs_.SetValue(prefs::kDiskCacheDir,
-                    Value::CreateStringValue(expanded_value));
+                    base::StringValue::New(expanded_value));
     delete value;
     return true;
   }
@@ -509,8 +507,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyFileSelectionDialogsPolicy(
     bool result = value->GetAsBoolean(&allow_file_selection_dialogs);
     DCHECK(result);
     if (!allow_file_selection_dialogs) {
-      prefs_.SetValue(prefs::kPromptForDownload,
-                      Value::CreateBooleanValue(false));
+      prefs_.SetValue(prefs::kPromptForDownload, base::FalseValue());
     }
     return true;
   }
@@ -549,7 +546,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyDefaultSearchPolicy(
     // We own |value|.
     delete value;
     prefs_.SetValue(prefs::kDefaultSearchProviderEncodings,
-                    Value::CreateStringValue(encodings));
+                    base::StringValue::New(encodings));
     return true;
   }
 
@@ -572,7 +569,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyIncognitoModePolicy(
       if (IncognitoModePrefs::IntToAvailability(availability,
                                                 &availability_enum_value)) {
         prefs_.SetValue(prefs::kIncognitoModeAvailability,
-                        Value::CreateIntegerValue(availability_enum_value));
+                        base::NumberValue::New(availability_enum_value));
       } else {
         LOG(WARNING) << "IncognitoModeAvailability policy value is "
                      << "out of range " << availability;
@@ -602,7 +599,7 @@ bool ConfigurationPolicyPrefKeeper::ApplyBookmarksPolicy(
   // kEnableBookmarkBar is managed, kShowBookmarkBar should be false so that
   // the bookmarks bar either is completely disabled or only shows on the NTP.
   // This also disables the checkbox for this preference in the prefs UI.
-  prefs_.SetValue(prefs::kShowBookmarkBar, Value::CreateBooleanValue(false));
+  prefs_.SetValue(prefs::kShowBookmarkBar, base::FalseValue());
   return true;
 }