Componentize proxy code from chrome/browser/net

chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index 815fa789ada0bd408a9cf68ca0b911f3d5b08416..c49133c48c74607115ca21a493218ce7099bc462 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -140,7 +140,7 @@ void CoreChromeOSOptionsHandler::InitializeHandler() {
     profile_prefs = profile->GetPrefs();
     ObservePref(prefs::kOpenNetworkConfiguration);
   }
-  ObservePref(prefs::kProxy);
+  ObservePref(ProxyPrefs::prefs::kProxy);
   ObservePref(prefs::kDeviceOpenNetworkConfiguration);
   proxy_config_service_.SetPrefs(profile_prefs,
                                  g_browser_process->local_state());
@@ -181,8 +181,9 @@ base::Value* CoreChromeOSOptionsHandler::FetchPref(
 
   Profile* profile = Profile::FromWebUI(web_ui());
   if (!CrosSettings::IsCrosSettings(pref_name)) {
-    std::string controlling_pref =
-        pref_name == prefs::kUseSharedProxies ? prefs::kProxy : std::string();
+    std::string controlling_pref = pref_name == prefs::kUseSharedProxies
+                                       ? ProxyPrefs::prefs::kProxy
+                                       : std::string();
     base::Value* value = CreateValueForPref(pref_name, controlling_pref);
     if (!IsSettingShared(pref_name) || !IsSecondaryUser(profile))
       return value;
@@ -384,14 +385,14 @@ void CoreChromeOSOptionsHandler::OnPreferenceChanged(
   // preferences change.
   if (pref_name == prefs::kOpenNetworkConfiguration ||
       pref_name == prefs::kDeviceOpenNetworkConfiguration ||
-      pref_name == prefs::kProxy) {
+      pref_name == ProxyPrefs::prefs::kProxy) {
     NotifyProxyPrefsChanged();
     return;
   }
   if (pref_name == prefs::kUseSharedProxies) {
     // kProxy controls kUseSharedProxies and decides if it's managed by
     // policy/extension.
-    NotifyPrefChanged(prefs::kUseSharedProxies, prefs::kProxy);
+    NotifyPrefChanged(prefs::kUseSharedProxies, ProxyPrefs::prefs::kProxy);
     return;
   }
   ::options::CoreOptionsHandler::OnPreferenceChanged(service, pref_name);