Copy changes in r115955 from options to options2

chrome/browser/ui/webui/options2/advanced_options_handler2.cc

Index: chrome/browser/ui/webui/options2/advanced_options_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc b/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
index 7800d00e46452d23fbf06086a63795c3f82cc55c..f0f0303081e58022102804cd0e288ed1e6ae041e 100644
--- a/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/advanced_options_handler2.cc
@@ -268,7 +268,7 @@ void AdvancedOptionsHandler::RegisterMessages() {
 #endif
 
   auto_open_files_.Init(prefs::kDownloadExtensionsToOpen, prefs, this);
-  default_font_size_.Init(prefs::kWebKitDefaultFontSize, prefs, this);
+  default_font_size_.Init(prefs::kWebKitGlobalDefaultFontSize, prefs, this);
   default_zoom_level_.Init(prefs::kDefaultZoomLevel, prefs, this);
 #if !defined(OS_CHROMEOS)
   proxy_prefs_.reset(
@@ -342,7 +342,7 @@ void AdvancedOptionsHandler::Observe(
       if (cloud_print_connector_ui_enabled_)
         SetupCloudPrintConnectorSection();
 #endif
-    } else if (*pref_name == prefs::kWebKitDefaultFontSize) {
+    } else if (*pref_name == prefs::kWebKitGlobalDefaultFontSize) {
       SetupFontSizeSelector();
     } else if (*pref_name == prefs::kDefaultZoomLevel) {
       SetupPageZoomSelector();