more changes

chrome/browser/ui/webui/options/browser_options_handler.cc

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 75007b0c5b994b0b5574ecfb4306ab221564fab1..fe3e7ef05c6fd9a31300d2789208ae5d99ba5e06 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -251,14 +251,14 @@ void BrowserOptionsHandler::SetDefaultWebClientUIState(
 }
 
 void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) {
-  scoped_ptr<Value> status_string(Value::CreateStringValue(
+  scoped_ptr<Value> status_string(base::StringValue::New(
       l10n_util::GetStringFUTF16(status_string_id,
                                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
 
-  scoped_ptr<Value> is_default(Value::CreateBooleanValue(
+  scoped_ptr<Value> is_default(base::BooleanValue::New(
       status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT));
 
-  scoped_ptr<Value> can_be_default(Value::CreateBooleanValue(
+  scoped_ptr<Value> can_be_default(base::BooleanValue::New(
       !default_browser_policy_.IsManaged() &&
       (status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT ||
        status_string_id == IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT)));
@@ -290,8 +290,8 @@ void BrowserOptionsHandler::OnTemplateURLServiceChanged() {
       default_index = i;
   }
 
-  scoped_ptr<Value> default_value(Value::CreateIntegerValue(default_index));
-  scoped_ptr<Value> default_managed(Value::CreateBooleanValue(
+  scoped_ptr<Value> default_value(base::NumberValue::New(default_index));
+  scoped_ptr<Value> default_managed(base::BooleanValue::New(
       template_url_service_->is_default_search_managed()));
 
   web_ui_->CallJavascriptFunction("BrowserOptions.updateSearchEngines",
@@ -329,7 +329,7 @@ void BrowserOptionsHandler::UpdateRestoreOnStartup() {
   Profile* profile = Profile::FromWebUI(web_ui_);
   const SessionStartupPref startup_pref =
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
-  base::FundamentalValue restore_on_startup(startup_pref.type);
+  base::NumberValue restore_on_startup(startup_pref.type);
   web_ui_->CallJavascriptFunction("BrowserOptions.updateRestoreOnStartup",
                                   restore_on_startup);
 }
@@ -526,7 +526,7 @@ void BrowserOptionsHandler::DisableInstant(const ListValue* args) {
 }
 
 void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
-  base::FundamentalValue enabled(
+  base::BooleanValue enabled(
       InstantFieldTrial::IsExperimentGroup(Profile::FromWebUI(web_ui_)));
   web_ui_->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
                                   enabled);