more changes

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

Index: chrome/browser/ui/webui/options/font_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index 49f6d38902fbe9138d6db4e3ecc8ad5b173105b5..4aa8e77dac8300656e509440f079a7036a5c0664 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -127,22 +127,22 @@ void FontSettingsHandler::FontsListHasLoaded(
       CharacterEncoding::GetCanonicalEncodingNameByCommandId(cmd_id);
       string16 name = it->encoding_display_name;
       base::i18n::AdjustStringForLocaleDirection(&name);
-      option->Append(Value::CreateStringValue(encoding));
-      option->Append(Value::CreateStringValue(name));
+      option->Append(base::StringValue::New(encoding));
+      option->Append(base::StringValue::New(name));
     } else {
       // Add empty name/value to indicate a separator item.
-      option->Append(Value::CreateStringValue(""));
-      option->Append(Value::CreateStringValue(""));
+      option->Append(base::StringValue::New(""));
+      option->Append(base::StringValue::New(""));
     }
     encoding_list.Append(option);
   }
 
   ListValue selected_values;
-  selected_values.Append(Value::CreateStringValue(standard_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(serif_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(sans_serif_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(fixed_font_.GetValue()));
-  selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
+  selected_values.Append(base::StringValue::New(standard_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(serif_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(sans_serif_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(fixed_font_.GetValue()));
+  selected_values.Append(base::StringValue::New(font_encoding_.GetValue()));
 
   web_ui_->CallJavascriptFunction("FontSettings.setFontsData",
                                   *list->list.get(), encoding_list,
@@ -175,34 +175,34 @@ void FontSettingsHandler::Observe(int type,
 
 void FontSettingsHandler::SetUpStandardFontSample() {
   base::StringValue font_value(standard_font_.GetValue());
-  base::FundamentalValue size_value(default_font_size_.GetValue());
+  base::NumberValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpStandardFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSerifFontSample() {
   base::StringValue font_value(serif_font_.GetValue());
-  base::FundamentalValue size_value(default_font_size_.GetValue());
+  base::NumberValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpSerifFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpSansSerifFontSample() {
   base::StringValue font_value(sans_serif_font_.GetValue());
-  base::FundamentalValue size_value(default_font_size_.GetValue());
+  base::NumberValue size_value(default_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpSansSerifFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpFixedFontSample() {
   base::StringValue font_value(fixed_font_.GetValue());
-  base::FundamentalValue size_value(default_fixed_font_size_.GetValue());
+  base::NumberValue size_value(default_fixed_font_size_.GetValue());
   web_ui_->CallJavascriptFunction(
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
-  base::FundamentalValue size_value(minimum_font_size_.GetValue());
+  base::NumberValue size_value(minimum_font_size_.GetValue());
   web_ui_->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                   size_value);
 }