Move code for old, deprecated Options UI to only ChromeOS

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 f5a045c438c172086caa0921b1ba942c11e4f956..7b1ca1ff248853a8ef53a0c2cf95b9086f8e0c17 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/webui/options/font_settings_utils.h"
+#include "chrome/browser/ui/webui/settings_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
@@ -116,7 +116,9 @@ void FontSettingsHandler::InitializePage() {
 void FontSettingsHandler::RegisterMessages() {
   // Perform validation for saved fonts.
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
-  FontSettingsUtilities::ValidateSavedFonts(pref_service);
+#if defined(OS_MACOSX)
+  settings_utils::ValidateSavedFonts(pref_service);
+#endif
 
   // Register for preferences that we need to observe manually.
   standard_font_.Init(prefs::kWebKitStandardFontFamily,
@@ -192,14 +194,14 @@ void FontSettingsHandler::FontsListHasLoaded(
   }
 
   base::ListValue selected_values;
-  selected_values.AppendString(FontSettingsUtilities::MaybeGetLocalizedFontName(
-      standard_font_.GetValue()));
   selected_values.AppendString(
-      FontSettingsUtilities::MaybeGetLocalizedFontName(serif_font_.GetValue()));
-  selected_values.AppendString(FontSettingsUtilities::MaybeGetLocalizedFontName(
-      sans_serif_font_.GetValue()));
+      settings_utils::MaybeGetLocalizedFontName(standard_font_.GetValue()));
   selected_values.AppendString(
-      FontSettingsUtilities::MaybeGetLocalizedFontName(fixed_font_.GetValue()));
+      settings_utils::MaybeGetLocalizedFontName(serif_font_.GetValue()));
+  selected_values.AppendString(
+      settings_utils::MaybeGetLocalizedFontName(sans_serif_font_.GetValue()));
+  selected_values.AppendString(
+      settings_utils::MaybeGetLocalizedFontName(fixed_font_.GetValue()));
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "FontSettings.setFontsData", *list.get(), selected_values);
@@ -207,7 +209,7 @@ void FontSettingsHandler::FontsListHasLoaded(
 
 void FontSettingsHandler::SetUpStandardFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(standard_font_.GetValue()));
+      settings_utils::ResolveFontList(standard_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpStandardFontSample",
                                          font_value, size_value);
@@ -215,7 +217,7 @@ void FontSettingsHandler::SetUpStandardFontSample() {
 
 void FontSettingsHandler::SetUpSerifFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(serif_font_.GetValue()));
+      settings_utils::ResolveFontList(serif_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpSerifFontSample",
                                          font_value, size_value);
@@ -223,7 +225,7 @@ void FontSettingsHandler::SetUpSerifFontSample() {
 
 void FontSettingsHandler::SetUpSansSerifFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(sans_serif_font_.GetValue()));
+      settings_utils::ResolveFontList(sans_serif_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe(
       "FontSettings.setUpSansSerifFontSample", font_value, size_value);
@@ -231,7 +233,7 @@ void FontSettingsHandler::SetUpSansSerifFontSample() {
 
 void FontSettingsHandler::SetUpFixedFontSample() {
   base::Value font_value(
-      FontSettingsUtilities::ResolveFontList(fixed_font_.GetValue()));
+      settings_utils::ResolveFontList(fixed_font_.GetValue()));
   base::Value size_value(default_fixed_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpFixedFontSample",
                                          font_value, size_value);