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

BUG=160586
R=estade@chromium.org
TBR=akalin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11415226

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170936 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 118 insertions, 131 deletions

diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index 964bb32..7523ded 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -432,9 +432,8 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
       const ListValue* rejected_emails = profile->GetPrefs()->GetList(
           prefs::kReverseAutologinRejectedEmailList);
       if (!rejected_emails->empty()) {
-        const scoped_ptr<Value> email_value(new base::StringValue(email));
         base::ListValue::const_iterator iter = rejected_emails->Find(
-            *email_value);
+            base::StringValue(email));
         if (iter != rejected_emails->end())
           return false;
       }
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 6da1da3..2632fec 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -111,7 +111,7 @@ void GetValueList(const AutofillProfile& profile,
     return;
 
   for (size_t i = 0; i < values.size(); ++i) {
-    (*list)->Set(i, Value::CreateStringValue(values[i]));
+    (*list)->Set(i, new base::StringValue(values[i]));
   }
 }
 
@@ -150,9 +150,9 @@ void GetNameList(const AutofillProfile& profile,
 
   for (size_t i = 0; i < first_names.size(); ++i) {
     ListValue* name = new ListValue;  // owned by |list|
-    name->Set(0, Value::CreateStringValue(first_names[i]));
-    name->Set(1, Value::CreateStringValue(middle_names[i]));
-    name->Set(2, Value::CreateStringValue(last_names[i]));
+    name->Set(0, new base::StringValue(first_names[i]));
+    name->Set(1, new base::StringValue(middle_names[i]));
+    name->Set(2, new base::StringValue(last_names[i]));
     (*names)->Set(i, name);
   }
 }
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 104644f..279c026 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -783,21 +783,21 @@ bool BrowserOptionsHandler::IsInteractiveSetDefaultPermitted() {
 }
 
 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() {
@@ -823,13 +823,12 @@ void BrowserOptionsHandler::OnTemplateURLServiceChanged() {
       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
@@ -1376,11 +1375,11 @@ void BrowserOptionsHandler::SetupPageZoomSelector() {
     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);
   }
 
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index 18ee17e..a02e5f9 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -1014,7 +1014,7 @@ void CertificateManagerHandler::PopulateTree(const std::string& tab_name,
     std::sort(nodes->begin(), nodes->end(), comparator);
 
     ListValue args;
-    args.Append(Value::CreateStringValue(tree_name));
+    args.Append(new base::StringValue(tree_name));
     args.Append(nodes);
     web_ui()->CallJavascriptFunction("CertificateManager.onPopulateTree", args);
   }
@@ -1023,9 +1023,9 @@ void CertificateManagerHandler::PopulateTree(const std::string& tab_name,
 void CertificateManagerHandler::ShowError(const std::string& title,
                                           const std::string& error) const {
   ScopedVector<const Value> args;
-  args.push_back(Value::CreateStringValue(title));
-  args.push_back(Value::CreateStringValue(error));
-  args.push_back(Value::CreateStringValue(l10n_util::GetStringUTF8(IDS_OK)));
+  args.push_back(new base::StringValue(title));
+  args.push_back(new base::StringValue(error));
+  args.push_back(new base::StringValue(l10n_util::GetStringUTF8(IDS_OK)));
   args.push_back(Value::CreateNullValue());  // cancelTitle
   args.push_back(Value::CreateNullValue());  // okCallback
   args.push_back(Value::CreateNullValue());  // cancelCallback
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index 2672e33..39506dd 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -520,7 +520,7 @@ void PopulateVPNDetails(
                          chromeos::onc::kVPN,
                          chromeos::onc::vpn::kHost));
   SetValueDictionary(dictionary, kTagServerHostname,
-                     Value::CreateStringValue(vpn->server_hostname()),
+                     new base::StringValue(vpn->server_hostname()),
                      hostname_ui_data);
 }
 
@@ -1311,7 +1311,7 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(
   dictionary.SetBoolean(kTagShowPreferred,
                         network_profile == chromeos::PROFILE_USER);
   SetValueDictionary(&dictionary, kTagPreferred,
-                     Value::CreateBooleanValue(network->preferred()),
+                     new base::FundamentalValue(network->preferred()),
                      property_ui_data);
 
   chromeos::NetworkPropertyUIData auto_connect_ui_data(ui_data);
@@ -1323,7 +1323,7 @@ void InternetOptionsHandler::PopulateIPConfigsCallback(
                            chromeos::onc::wifi::kAutoConnect));
   }
   SetValueDictionary(&dictionary, kTagAutoConnect,
-                     Value::CreateBooleanValue(network->auto_connect()),
+                     new base::FundamentalValue(network->auto_connect()),
                      auto_connect_ui_data);
 
   if (type == chromeos::TYPE_WIFI) {
@@ -1444,7 +1444,7 @@ void InternetOptionsHandler::PopulateCellularDetails(
         device->technology_family() == chromeos::TECHNOLOGY_FAMILY_GSM);
     SetValueDictionary(
         dictionary, kTagSimCardLockEnabled,
-        Value::CreateBooleanValue(
+        new base::FundamentalValue(
             device->sim_pin_required() == chromeos::SIM_PIN_REQUIRED),
         cellular_property_ui_data);
 
diff --git a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
index 88e331b..18ddf57 100644
--- a/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc
@@ -83,8 +83,8 @@ void KeyboardHandler::GetLocalizedValues(DictionaryValue* localized_strings) {
         continue;
       }
       ListValue* option = new ListValue();
-      option->Append(Value::CreateIntegerValue(value));
-      option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
+      option->Append(new base::FundamentalValue(value));
+      option->Append(new base::StringValue(l10n_util::GetStringUTF16(
           message_id)));
       list_value->Append(option);
     }
diff --git a/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc
index 3a0274a..4000291 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_hangul_handler.cc
@@ -36,9 +36,9 @@ ListValue* LanguageHangulHandler::GetKeyboardLayoutList() {
   ListValue* keyboard_layout_list = new ListValue();
   for (size_t i = 0; i < language_prefs::kNumHangulKeyboardNameIDPairs; ++i) {
     ListValue* option = new ListValue();
-    option->Append(Value::CreateStringValue(
+    option->Append(new base::StringValue(
         language_prefs::kHangulKeyboardNameIDPairs[i].keyboard_id));
-    option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
+    option->Append(new base::StringValue(l10n_util::GetStringUTF16(
         language_prefs::kHangulKeyboardNameIDPairs[i].message_id)));
     keyboard_layout_list->Append(option);
   }
diff --git a/chrome/browser/ui/webui/options/chromeos/language_options_util.cc b/chrome/browser/ui/webui/options/chromeos/language_options_util.cc
index e8e996f..7604fba 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_options_util.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_options_util.cc
@@ -8,12 +8,12 @@ namespace chromeos {
 namespace options {
 
 // See comments in .h.
-Value* CreateValue(const char* in_value) {
-  return Value::CreateStringValue(in_value);
+base::Value* CreateValue(const char* in_value) {
+  return new base::StringValue(in_value);
 }
 
-Value* CreateValue(int in_value) {
-  return Value::CreateIntegerValue(in_value);
+base::Value* CreateValue(int in_value) {
+  return new base::FundamentalValue(in_value);
 }
 
 }  // namespace options
diff --git a/chrome/browser/ui/webui/options/chromeos/language_options_util.h b/chrome/browser/ui/webui/options/chromeos/language_options_util.h
index 74e5617..34f4541 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_options_util.h
+++ b/chrome/browser/ui/webui/options/chromeos/language_options_util.h
@@ -49,8 +49,8 @@ std::string GetTemplateDataMaxName(const T& preference, const char* prefix) {
 // Creates a Value object from the given value. Here we use function
 // overloading to handle string and integer preferences in
 // CreateMultipleChoiceList.
-Value* CreateValue(const char* in_value);
-Value* CreateValue(int in_value);
+base::Value* CreateValue(const char* in_value);
+base::Value* CreateValue(int in_value);
 
 // Creates a multiple choice list from the given preference.
 template <typename T>
@@ -71,7 +71,7 @@ base::ListValue* CreateMultipleChoiceList(
     base::ListValue* option = new base::ListValue();
     option->Append(CreateValue(
         preference.values_and_ids[i].ibus_config_value));
-    option->Append(base::Value::CreateStringValue(l10n_util::GetStringUTF16(
+    option->Append(new base::StringValue(l10n_util::GetStringUTF16(
         preference.values_and_ids[i].item_message_id)));
     list_value->Append(option);
   }
diff --git a/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc
index 099c293..3fe196f 100644
--- a/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/language_pinyin_handler.cc
@@ -51,10 +51,10 @@ void LanguagePinyinHandler::GetLocalizedValues(
         item_message_id == 0)
       break;
     ListValue* option = new ListValue();
-    option->Append(Value::CreateIntegerValue(
+    option->Append(new base::FundamentalValue(
         language_prefs::kPinyinDoublePinyinSchema.values_and_ids[i].
         ibus_config_value));
-    option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16(
+    option->Append(new base::StringValue(l10n_util::GetStringUTF16(
         language_prefs::kPinyinDoublePinyinSchema.values_and_ids[i].
         item_message_id)));
     list_value->Append(option);
diff --git a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc
index f2ed2c3..ef6d809 100644
--- a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc
+++ b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc
@@ -132,9 +132,9 @@ scoped_ptr<base::ListValue> GetTimezoneList() {
        iter != timezones.end(); ++iter) {
     const icu::TimeZone* timezone = *iter;
     base::ListValue* option = new base::ListValue();
-    option->Append(Value::CreateStringValue(
+    option->Append(new base::StringValue(
         chromeos::system::TimezoneSettings::GetTimezoneID(*timezone)));
-    option->Append(Value::CreateStringValue(GetTimezoneName(*timezone)));
+    option->Append(new base::StringValue(GetTimezoneName(*timezone)));
     timezoneList->Append(option);
   }
   return timezoneList.Pass();
diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 5a580f9..bb476e2c 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
@@ -97,8 +97,8 @@ void ClearBrowserDataHandler::GetLocalizedValues(
         break;
     }
     ListValue* option = new ListValue();
-    option->Append(Value::CreateIntegerValue(i));
-    option->Append(Value::CreateStringValue(label_string));
+    option->Append(new base::FundamentalValue(i));
+    option->Append(new base::StringValue(label_string));
     time_list->Append(option);
   }
   localized_strings->Set("clearBrowserDataTimeList", time_list);
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 5e217c3..6f6a838 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -1065,7 +1065,7 @@ void ContentSettingsHandler::ApplyWhitelist(ContentSettingsType content_type,
         ContentSettingsPattern::Wildcard(),
         CONTENT_SETTINGS_TYPE_PLUGINS,
         "google-talk",
-        Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+        new base::FundamentalValue(CONTENT_SETTING_ALLOW));
   }
   prefs->SetInteger(prefs::kContentSettingsDefaultWhitelistVersion,
                     kDefaultWhitelistVersion);
@@ -1246,17 +1246,12 @@ void ContentSettingsHandler::CheckExceptionPatternValidity(
     is_valid = pattern.IsValid();
   }
 
-  scoped_ptr<Value> type_value(Value::CreateStringValue(type_string));
-  scoped_ptr<Value> mode_value(Value::CreateStringValue(mode_string));
-  scoped_ptr<Value> pattern_value(Value::CreateStringValue(pattern_string));
-  scoped_ptr<Value> valid_value(Value::CreateBooleanValue(is_valid));
-
   web_ui()->CallJavascriptFunction(
       "ContentSettings.patternValidityCheckComplete",
-      *type_value.get(),
-      *mode_value.get(),
-      *pattern_value.get(),
-      *valid_value.get());
+      base::StringValue(type_string),
+      base::StringValue(mode_string),
+      base::StringValue(pattern_string),
+      base::FundamentalValue(is_valid));
 }
 
 // static
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 4bb075c..254a1f5 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -152,9 +152,8 @@ void CookiesViewHandler::TreeNodesAdded(ui::TreeModel* model,
   ListValue args;
   args.Append(parent == tree_model->GetRoot() ?
       Value::CreateNullValue() :
-      Value::CreateStringValue(
-          model_util_->GetTreeNodeId(parent_node)));
-  args.Append(Value::CreateIntegerValue(start));
+      new base::StringValue(model_util_->GetTreeNodeId(parent_node)));
+  args.Append(new base::FundamentalValue(start));
   args.Append(children);
   web_ui()->CallJavascriptFunction(
       GetCallback("onTreeItemAdded", tree_model), args);
@@ -173,10 +172,10 @@ void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model,
   ListValue args;
   args.Append(parent == tree_model->GetRoot() ?
       Value::CreateNullValue() :
-      Value::CreateStringValue(model_util_->GetTreeNodeId(
+      new base::StringValue(model_util_->GetTreeNodeId(
           tree_model->AsNode(parent))));
-  args.Append(Value::CreateIntegerValue(start));
-  args.Append(Value::CreateIntegerValue(count));
+  args.Append(new base::FundamentalValue(start));
+  args.Append(new base::FundamentalValue(count));
   web_ui()->CallJavascriptFunction(
       GetCallback("onTreeItemRemoved", tree_model), args);
 }
@@ -309,7 +308,7 @@ void CookiesViewHandler::SendChildren(const CookieTreeNode* parent) {
   ListValue args;
   args.Append(parent == GetTreeModel()->GetRoot() ?
       Value::CreateNullValue() :
-      Value::CreateStringValue(model_util_->GetTreeNodeId(parent)));
+      new base::StringValue(model_util_->GetTreeNodeId(parent)));
   args.Append(children);
 
   web_ui()->CallJavascriptFunction(
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 3a07265..4515b5c 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -285,7 +285,7 @@ void CoreOptionsHandler::DispatchPrefChangeNotification(
             PreferenceCallbackMap::const_iterator> range =
       pref_callback_map_.equal_range(name);
   ListValue result_value;
-  result_value.Append(base::Value::CreateStringValue(name.c_str()));
+  result_value.Append(new base::StringValue(name.c_str()));
   result_value.Append(value.release());
   for (PreferenceCallbackMap::const_iterator iter = range.first;
        iter != range.second; ++iter) {
@@ -463,7 +463,7 @@ void CoreOptionsHandler::HandleSetPref(const ListValue* args, PrefType type) {
       double double_value;
       CHECK(value->GetAsDouble(&double_value));
       int int_value = static_cast<int>(double_value);
-      temp_value.reset(base::Value::CreateIntegerValue(int_value));
+      temp_value.reset(new base::FundamentalValue(int_value));
       value = temp_value.get();
       break;
     }
@@ -477,7 +477,7 @@ void CoreOptionsHandler::HandleSetPref(const ListValue* args, PrefType type) {
       std::string original;
       CHECK(value->GetAsString(&original));
       GURL fixed = URLFixerUpper::FixupURL(original, std::string());
-      temp_value.reset(base::Value::CreateStringValue(fixed.spec()));
+      temp_value.reset(new base::StringValue(fixed.spec()));
       value = temp_value.get();
       break;
     }
@@ -524,19 +524,17 @@ void CoreOptionsHandler::HandleUserMetricsAction(const ListValue* args) {
 }
 
 void CoreOptionsHandler::UpdateClearPluginLSOData() {
-  scoped_ptr<base::Value> enabled(
-      base::Value::CreateBooleanValue(
-          plugin_status_pref_setter_.IsClearPluginLSODataEnabled()));
+  base::FundamentalValue enabled(
+          plugin_status_pref_setter_.IsClearPluginLSODataEnabled());
   web_ui()->CallJavascriptFunction(
-      "OptionsPage.setClearPluginLSODataEnabled", *enabled);
+      "OptionsPage.setClearPluginLSODataEnabled", enabled);
 }
 
 void CoreOptionsHandler::UpdatePepperFlashSettingsEnabled() {
-  scoped_ptr<base::Value> enabled(
-      base::Value::CreateBooleanValue(
-          plugin_status_pref_setter_.IsPepperFlashSettingsEnabled()));
+  base::FundamentalValue enabled(
+          plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
   web_ui()->CallJavascriptFunction(
-      "OptionsPage.setPepperFlashSettingsEnabled", *enabled);
+      "OptionsPage.setPepperFlashSettingsEnabled", enabled);
 }
 
 }  // namespace options
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index c98ef24..f82aaf7 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -161,7 +161,7 @@ void FontSettingsHandler::FontsListHasLoaded(
     bool has_value = font->GetString(1, &value);
     DCHECK(has_value);
     bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(value);
-    font->Append(Value::CreateStringValue(has_rtl_chars ? "rtl" : "ltr"));
+    font->Append(new base::StringValue(has_rtl_chars ? "rtl" : "ltr"));
   }
 
   ListValue encoding_list;
@@ -183,27 +183,27 @@ void FontSettingsHandler::FontsListHasLoaded(
       CharacterEncoding::GetCanonicalEncodingNameByCommandId(cmd_id);
       string16 name = it->encoding_display_name;
       bool has_rtl_chars = base::i18n::StringContainsStrongRTLChars(name);
-      option->Append(Value::CreateStringValue(encoding));
-      option->Append(Value::CreateStringValue(name));
-      option->Append(Value::CreateStringValue(has_rtl_chars ? "rtl" : "ltr"));
+      option->Append(new base::StringValue(encoding));
+      option->Append(new base::StringValue(name));
+      option->Append(new base::StringValue(has_rtl_chars ? "rtl" : "ltr"));
     } else {
       // Add empty name/value to indicate a separator item.
-      option->Append(Value::CreateStringValue(""));
-      option->Append(Value::CreateStringValue(""));
+      option->Append(new base::StringValue(""));
+      option->Append(new base::StringValue(""));
     }
     encoding_list.Append(option);
   }
 
   ListValue selected_values;
-  selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
+  selected_values.Append(new base::StringValue(MaybeGetLocalizedFontName(
       standard_font_.GetValue())));
-  selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
+  selected_values.Append(new base::StringValue(MaybeGetLocalizedFontName(
       serif_font_.GetValue())));
-  selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
+  selected_values.Append(new base::StringValue(MaybeGetLocalizedFontName(
       sans_serif_font_.GetValue())));
-  selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
+  selected_values.Append(new base::StringValue(MaybeGetLocalizedFontName(
       fixed_font_.GetValue())));
-  selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
+  selected_values.Append(new base::StringValue(font_encoding_.GetValue()));
 
   web_ui()->CallJavascriptFunction("FontSettings.setFontsData",
                                    *list.get(), encoding_list,
diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc
index 551b3fb..b40ab9a 100644
--- a/chrome/browser/ui/webui/options/handler_options_handler.cc
+++ b/chrome/browser/ui/webui/options/handler_options_handler.cc
@@ -92,9 +92,9 @@ static void GetHandlersAsListValue(
   ProtocolHandlerRegistry::ProtocolHandlerList::const_iterator handler;
   for (handler = handlers.begin(); handler != handlers.end(); ++handler) {
     ListValue* handlerValue = new ListValue();
-    handlerValue->Append(Value::CreateStringValue(handler->protocol()));
-    handlerValue->Append(Value::CreateStringValue(handler->url().spec()));
-    handlerValue->Append(Value::CreateStringValue(handler->title()));
+    handlerValue->Append(new base::StringValue(handler->protocol()));
+    handlerValue->Append(new base::StringValue(handler->url().spec()));
+    handlerValue->Append(new base::StringValue(handler->title()));
     handler_list->Append(handlerValue);
   }
 }
diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index d878e3a7..3b1bf57 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc
@@ -124,14 +124,14 @@ void ManageProfileHandler::SendProfileIcons(
     if (icon) {
       gfx::Image icon2 = profiles::GetAvatarIconForWebUI(*icon, true);
       gaia_picture_url_ = web_ui_util::GetBitmapDataUrl(icon2.AsBitmap());
-      image_url_list.Append(Value::CreateStringValue(gaia_picture_url_));
+      image_url_list.Append(new base::StringValue(gaia_picture_url_));
     }
   }
 
   // Next add the default avatar icons.
   for (size_t i = 0; i < ProfileInfoCache::GetDefaultAvatarIconCount(); i++) {
     std::string url = ProfileInfoCache::GetDefaultAvatarIconUrl(i);
-    image_url_list.Append(Value::CreateStringValue(url));
+    image_url_list.Append(new base::StringValue(url));
   }
 
   web_ui()->CallJavascriptFunction(
diff --git a/chrome/browser/ui/webui/options/options_sync_setup_handler.cc b/chrome/browser/ui/webui/options/options_sync_setup_handler.cc
index 32c4acc..f1b43f2c 100644
--- a/chrome/browser/ui/webui/options/options_sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/options_sync_setup_handler.cc
@@ -20,8 +20,8 @@ OptionsSyncSetupHandler::~OptionsSyncSetupHandler() {
 
 void OptionsSyncSetupHandler::ShowSetupUI() {
   // Show the Sync Setup page.
-  scoped_ptr<Value> page(Value::CreateStringValue("syncSetup"));
-  web_ui()->CallJavascriptFunction("OptionsPage.navigateToPage", *page);
+  web_ui()->CallJavascriptFunction("OptionsPage.navigateToPage",
+                                   base::StringValue("syncSetup"));
 }
 
 }  // namespace options
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index 2fe90a9..3a51a60 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc
@@ -201,13 +201,12 @@ void PreferencesBrowserTest::SetUserValues(
     pref_service_->Set(names[i].c_str(), *values[i]);
 }
 
-void PreferencesBrowserTest::VerifyKeyValue(const base::DictionaryValue* dict,
+void PreferencesBrowserTest::VerifyKeyValue(const base::DictionaryValue& dict,
                                             const std::string& key,
-                                            base::Value* expected) {
+                                            const base::Value& expected) {
   const base::Value* actual = NULL;
-  EXPECT_TRUE(dict->Get(key, &actual)) << "Was checking key: " << key;
-  EXPECT_EQ(*expected, *actual) << "Was checking key: " << key;
-  delete expected;
+  EXPECT_TRUE(dict.Get(key, &actual)) << "Was checking key: " << key;
+  EXPECT_EQ(expected, *actual) << "Was checking key: " << key;
 }
 
 void PreferencesBrowserTest::VerifyPref(const base::DictionaryValue* prefs,
@@ -220,21 +219,20 @@ void PreferencesBrowserTest::VerifyPref(const base::DictionaryValue* prefs,
   const base::DictionaryValue* dict;
   ASSERT_TRUE(prefs->GetWithoutPathExpansion(name, &pref));
   ASSERT_TRUE(pref->GetAsDictionary(&dict));
-  VerifyKeyValue(dict, "value", value->DeepCopy());
+  VerifyKeyValue(*dict, "value", *value);
   if (!controlledBy.empty()) {
-    VerifyKeyValue(dict, "controlledBy",
-                   base::Value::CreateStringValue(controlledBy));
+    VerifyKeyValue(*dict, "controlledBy", base::StringValue(controlledBy));
   } else {
     EXPECT_FALSE(dict->HasKey("controlledBy"));
   }
   if (disabled)
-    VerifyKeyValue(dict, "disabled", base::Value::CreateBooleanValue(true));
+    VerifyKeyValue(*dict, "disabled", base::FundamentalValue(true));
   else if (dict->HasKey("disabled"))
-    VerifyKeyValue(dict, "disabled", base::Value::CreateBooleanValue(false));
+    VerifyKeyValue(*dict, "disabled", base::FundamentalValue(false));
   if (uncommitted)
-    VerifyKeyValue(dict, "uncommitted", base::Value::CreateBooleanValue(true));
+    VerifyKeyValue(*dict, "uncommitted", base::FundamentalValue(true));
   else if (dict->HasKey("uncommitted"))
-    VerifyKeyValue(dict, "uncommitted", base::Value::CreateBooleanValue(false));
+    VerifyKeyValue(*dict, "uncommitted", base::FundamentalValue(false));
 }
 
 void PreferencesBrowserTest::VerifyObservedPref(const std::string& json,
@@ -326,7 +324,7 @@ void PreferencesBrowserTest::VerifySetPref(const std::string& name,
     ExpectSetCommit(name, value);
   else
     ExpectNoCommit(name);
-  scoped_ptr<base::Value> commit_ptr(base::Value::CreateBooleanValue(commit));
+  scoped_ptr<base::Value> commit_ptr(new base::FundamentalValue(commit));
   std::string value_json;
   std::string commit_json;
   base::JSONWriter::Write(value, &value_json);
@@ -351,7 +349,7 @@ void PreferencesBrowserTest::VerifyClearPref(const std::string& name,
     ExpectClearCommit(name);
   else
     ExpectNoCommit(name);
-  scoped_ptr<base::Value> commit_ptr(base::Value::CreateBooleanValue(commit));
+  scoped_ptr<base::Value> commit_ptr(new base::FundamentalValue(commit));
   std::string commit_json;
   base::JSONWriter::Write(commit_ptr.get(), &commit_json);
   std::wstringstream javascript;
@@ -424,26 +422,26 @@ void PreferencesBrowserTest::UseDefaultTestPrefs(bool includeListPref) {
   types_.push_back("Boolean");
   pref_names_.push_back(prefs::kAlternateErrorPagesEnabled);
   policy_names_.push_back(policy::key::kAlternateErrorPagesEnabled);
-  non_default_values_.push_back(base::Value::CreateBooleanValue(false));
+  non_default_values_.push_back(new base::FundamentalValue(false));
 
   // Integer pref.
   types_.push_back("Integer");
   pref_names_.push_back(prefs::kRestoreOnStartup);
   policy_names_.push_back(policy::key::kRestoreOnStartup);
-  non_default_values_.push_back(base::Value::CreateIntegerValue(4));
+  non_default_values_.push_back(new base::FundamentalValue(4));
 
   // String pref.
   types_.push_back("String");
   pref_names_.push_back(prefs::kEnterpriseWebStoreName);
   policy_names_.push_back(policy::key::kEnterpriseWebStoreName);
-  non_default_values_.push_back(base::Value::CreateStringValue("Store"));
+  non_default_values_.push_back(new base::StringValue("Store"));
 
   // URL pref.
   types_.push_back("URL");
   pref_names_.push_back(prefs::kEnterpriseWebStoreURL);
   policy_names_.push_back(policy::key::kEnterpriseWebStoreURL);
   non_default_values_.push_back(
-      base::Value::CreateStringValue("http://www.google.com/"));
+      new base::StringValue("http://www.google.com/"));
 
   // List pref.
   if (includeListPref) {
@@ -451,8 +449,8 @@ void PreferencesBrowserTest::UseDefaultTestPrefs(bool includeListPref) {
     pref_names_.push_back(prefs::kURLsToRestoreOnStartup);
     policy_names_.push_back(policy::key::kRestoreOnStartupURLs);
     base::ListValue* list = new base::ListValue;
-    list->Append(base::Value::CreateStringValue("http://www.google.com"));
-    list->Append(base::Value::CreateStringValue("http://example.com"));
+    list->Append(new base::StringValue("http://www.google.com"));
+    list->Append(new base::StringValue("http://example.com"));
     non_default_values_.push_back(list);
   }
 
@@ -642,16 +640,15 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSDeviceFetchPrefs) {
 
   // Boolean pref.
   pref_names_.push_back(chromeos::kAccountsPrefAllowGuest);
-  default_values_.push_back(base::Value::CreateBooleanValue(true));
-  non_default_values_.push_back(base::Value::CreateBooleanValue(false));
+  default_values_.push_back(new base::FundamentalValue(true));
+  non_default_values_.push_back(new base::FundamentalValue(false));
   decorated_non_default_values.push_back(
       non_default_values_.back()->DeepCopy());
 
   // String pref.
   pref_names_.push_back(chromeos::kReleaseChannel);
-  default_values_.push_back(base::Value::CreateStringValue(""));
-  non_default_values_.push_back(
-      base::Value::CreateStringValue("stable-channel"));
+  default_values_.push_back(new base::StringValue(""));
+  non_default_values_.push_back(new base::StringValue("stable-channel"));
   decorated_non_default_values.push_back(
       non_default_values_.back()->DeepCopy());
 
@@ -659,8 +656,8 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSDeviceFetchPrefs) {
   pref_names_.push_back(chromeos::kAccountsPrefUsers);
   default_values_.push_back(new base::ListValue);
   base::ListValue* list = new base::ListValue;
-  list->Append(base::Value::CreateStringValue("me@google.com"));
-  list->Append(base::Value::CreateStringValue("you@google.com"));
+  list->Append(new base::StringValue("me@google.com"));
+  list->Append(new base::StringValue("you@google.com"));
   non_default_values_.push_back(list);
   list = new base::ListValue;
   base::DictionaryValue* dict = new base::DictionaryValue;
@@ -704,25 +701,25 @@ IN_PROC_BROWSER_TEST_F(PreferencesBrowserTest, ChromeOSProxyFetchPrefs) {
 
   // Boolean pref.
   pref_names_.push_back(chromeos::kProxySingle);
-  default_values_.push_back(base::Value::CreateBooleanValue(false));
-  non_default_values_.push_back(base::Value::CreateBooleanValue(true));
+  default_values_.push_back(new base::FundamentalValue(false));
+  non_default_values_.push_back(new base::FundamentalValue(true));
 
   // Integer pref.
   pref_names_.push_back(chromeos::kProxySingleHttpPort);
-  default_values_.push_back(base::Value::CreateStringValue(""));
-  non_default_values_.push_back(base::Value::CreateIntegerValue(8080));
+  default_values_.push_back(new base::StringValue(""));
+  non_default_values_.push_back(new base::FundamentalValue(8080));
 
   // String pref.
   pref_names_.push_back(chromeos::kProxySingleHttp);
-  default_values_.push_back(base::Value::CreateStringValue(""));
-  non_default_values_.push_back(base::Value::CreateStringValue("127.0.0.1"));
+  default_values_.push_back(new base::StringValue(""));
+  non_default_values_.push_back(new base::StringValue("127.0.0.1"));
 
   // List pref.
   pref_names_.push_back(chromeos::kProxyIgnoreList);
   default_values_.push_back(new base::ListValue());
   base::ListValue* list = new base::ListValue();
-  list->Append(base::Value::CreateStringValue("www.google.com"));
-  list->Append(base::Value::CreateStringValue("example.com"));
+  list->Append(new base::StringValue("www.google.com"));
+  list->Append(new base::StringValue("example.com"));
   non_default_values_.push_back(list);
 
   // Verify notifications when default values are in effect.
diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.h b/chrome/browser/ui/webui/options/preferences_browsertest.h
index b26ac62..fe0841a 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.h
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.h
@@ -61,9 +61,9 @@ class PreferencesBrowserTest : public InProcessBrowserTest {
 
   // Verifies that a dictionary contains a (key, value) pair. Takes ownership of
   // |expected|.
-  void VerifyKeyValue(const base::DictionaryValue* dict,
+  void VerifyKeyValue(const base::DictionaryValue& dict,
                       const std::string& key,
-                      base::Value* expected);
+                      const base::Value& expected);
   // Verifies that a dictionary contains a given pref and that its value has
   // been decorated correctly.
   void VerifyPref(const base::DictionaryValue* prefs,