webui/options: Do not use Value::CreateStringValue.

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

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 765 matching lines @@
     return;  // Still processing.
 
   SetDefaultBrowserUIString(status_string_id);
 }
 
 bool BrowserOptionsHandler::IsInteractiveSetDefaultPermitted() {
   return true;  // This is UI so we can allow it.
 }
 
 void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) {
-  scoped_ptr<Value> status_string(Value::CreateStringValue(
+  base::StringValue status_string(
       l10n_util::GetStringFUTF16(status_string_id,
-                                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))));
+                                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
-  scoped_ptr<Value> is_default(Value::CreateBooleanValue(
-      status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT));
+  base::FundamentalValue is_default(
+      status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT);
 
-  scoped_ptr<Value> can_be_default(Value::CreateBooleanValue(
+  base::FundamentalValue can_be_default(
       !default_browser_policy_.IsManaged() &&
       (status_string_id == IDS_OPTIONS_DEFAULTBROWSER_DEFAULT ||
-       status_string_id == IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT)));
+       status_string_id == IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT));
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.updateDefaultBrowserState",
-      *status_string, *is_default, *can_be_default);
+      status_string, is_default, can_be_default);
 }
 
 void BrowserOptionsHandler::OnTemplateURLServiceChanged() {
   if (!template_url_service_ || !template_url_service_->loaded())
     return;
 
   const TemplateURL* default_url =
       template_url_service_->GetDefaultSearchProvider();
 
   int default_index = -1;
   ListValue search_engines;
   TemplateURLService::TemplateURLVector model_urls(
       template_url_service_->GetTemplateURLs());
   for (size_t i = 0; i < model_urls.size(); ++i) {
     if (!model_urls[i]->ShowInDefaultList())
       continue;
 
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("name", model_urls[i]->short_name());
     entry->SetInteger("index", i);
     search_engines.Append(entry);
     if (model_urls[i] == default_url)
       default_index = i;
   }
 
-  scoped_ptr<Value> default_value(Value::CreateIntegerValue(default_index));
-  scoped_ptr<Value> default_managed(Value::CreateBooleanValue(
-      template_url_service_->is_default_search_managed()));
-
-  web_ui()->CallJavascriptFunction("BrowserOptions.updateSearchEngines",
-                                   search_engines, *default_value,
-                                   *default_managed);
+  web_ui()->CallJavascriptFunction(
+      "BrowserOptions.updateSearchEngines",
+      search_engines,
+      base::FundamentalValue(default_index),
+      base::FundamentalValue(
+          template_url_service_->is_default_search_managed()));
 }
 
 // static
 void BrowserOptionsHandler::CreateDesktopShortcutForProfile(
      Profile* profile, Profile::CreateStatus status) {
   ProfileShortcutManager* shortcut_manager =
       g_browser_process->profile_manager()->profile_shortcut_manager();
   if (shortcut_manager)
     shortcut_manager->CreateProfileShortcut(profile->GetPath());
 }
@@ skipping 526 matching lines @@
   // Each item in the list has the following parameters:
   // 1. Title (string).
   // 2. Value (double).
   // 3. Is selected? (bool).
   ListValue zoom_factors_value;
   for (std::vector<double>::const_iterator i = zoom_factors.begin();
        i != zoom_factors.end(); ++i) {
     ListValue* option = new ListValue();
     double factor = *i;
     int percent = static_cast<int>(factor * 100 + 0.5);
-    option->Append(Value::CreateStringValue(
+    option->Append(new base::StringValue(
         l10n_util::GetStringFUTF16Int(IDS_ZOOM_PERCENT, percent)));
-    option->Append(Value::CreateDoubleValue(factor));
+    option->Append(new base::FundamentalValue(factor));
     bool selected = content::ZoomValuesEqual(factor, default_zoom_factor);
-    option->Append(Value::CreateBooleanValue(selected));
+    option->Append(new base::FundamentalValue(selected));
     zoom_factors_value.Append(option);
   }
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupPageZoomSelector", zoom_factors_value);
 }
 
 void BrowserOptionsHandler::SetupAutoOpenFileTypes() {
   // Set the hidden state for the AutoOpenFileTypesResetToDefault button.
   // We show the button if the user has any auto-open file types registered.
@@ skipping 28 matching lines @@
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupProxySettingsSection", disabled, label);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options