Rename CrosSettingsProviderProxy -> ProxyCrosSettingsProvider

to match naming pattern of UserCrosSettingsProvider etc.
reshuffle some code in more consistent way.
No Functionality Change.

BUG=http://crosbug.com/8645
TEST=None

Review URL: http://codereview.chromium.org/5078001

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

19 files changed, 66 insertions, 66 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 4de3a57..5fa4a2a 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -156,13 +156,13 @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
-#include "chrome/browser/chromeos/cros_settings_provider_stats.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
 #include "chrome/browser/views/browser_dialogs.h"
 #endif
 
diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc
index a0e1297..0c86226 100644
--- a/chrome/browser/chromeos/cros_settings.cc
+++ b/chrome/browser/chromeos/cros_settings.cc
@@ -8,7 +8,7 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings_provider.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/common/notification_service.h"
 
 namespace chromeos {
@@ -39,6 +39,15 @@ void CrosSettings::FireObservers(const char* path) {
   }
 }
 
+void CrosSettings::Set(const std::string& path, Value* in_value) {
+  DCHECK(CalledOnValidThread());
+  CrosSettingsProvider* provider;
+  provider = GetProvider(path);
+  if (provider) {
+    provider->Set(path, in_value);
+  }
+}
+
 void CrosSettings::SetBoolean(const std::string& path, bool in_value) {
   DCHECK(CalledOnValidThread());
   Set(path, Value::CreateBooleanValue(in_value));
@@ -60,16 +69,6 @@ void CrosSettings::SetString(const std::string& path,
   Set(path, Value::CreateStringValue(in_value));
 }
 
-bool CrosSettings::GetBoolean(const std::string& path,
-                              bool* bool_value) const {
-  DCHECK(CalledOnValidThread());
-  Value* value;
-  if (!Get(path, &value))
-    return false;
-
-  return value->GetAsBoolean(bool_value);
-}
-
 bool CrosSettings::AddSettingsProvider(CrosSettingsProvider* provider) {
   DCHECK(CalledOnValidThread());
   providers_.push_back(provider);
@@ -147,15 +146,6 @@ CrosSettingsProvider* CrosSettings::GetProvider(
   return NULL;
 }
 
-void CrosSettings::Set(const std::string& path, Value* in_value) {
-  DCHECK(CalledOnValidThread());
-  CrosSettingsProvider* provider;
-  provider = GetProvider(path);
-  if (provider) {
-    provider->Set(path, in_value);
-  }
-}
-
 bool CrosSettings::Get(const std::string& path, Value** out_value) const {
   DCHECK(CalledOnValidThread());
   CrosSettingsProvider* provider;
@@ -166,6 +156,16 @@ bool CrosSettings::Get(const std::string& path, Value** out_value) const {
   return false;
 }
 
+bool CrosSettings::GetBoolean(const std::string& path,
+                              bool* bool_value) const {
+  DCHECK(CalledOnValidThread());
+  Value* value;
+  if (!Get(path, &value))
+    return false;
+
+  return value->GetAsBoolean(bool_value);
+}
+
 bool CrosSettings::GetInteger(const std::string& path,
                               int* out_value) const {
   DCHECK(CalledOnValidThread());
@@ -200,7 +200,7 @@ CrosSettings::CrosSettings() {
 }
 
 CrosSettings::~CrosSettings() {
-  DCHECK(!providers_.size());
+  DCHECK(providers_.empty());
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc
index 93361c6..e461989 100644
--- a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc
@@ -9,8 +9,8 @@
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/dom_ui/dom_ui_util.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/chromeos/dom_ui/proxy_handler.cc b/chrome/browser/chromeos/dom_ui/proxy_handler.cc
index 2ca89be..ffe3040 100644
--- a/chrome/browser/chromeos/dom_ui/proxy_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/proxy_handler.cc
@@ -12,7 +12,7 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros_settings_provider_proxy.h"
+#include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
 #include "chrome/common/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
@@ -23,7 +23,7 @@
 namespace chromeos {
 
 ProxyHandler::ProxyHandler()
-    : CrosOptionsPageUIHandler(new CrosSettingsProviderProxy())  {
+    : CrosOptionsPageUIHandler(new ProxyCrosSettingsProvider())  {
 }
 
 ProxyHandler::~ProxyHandler() {
diff --git a/chrome/browser/chromeos/dom_ui/stats_options_handler.cc b/chrome/browser/chromeos/dom_ui/stats_options_handler.cc
index 2372a29..c228946 100644
--- a/chrome/browser/chromeos/dom_ui/stats_options_handler.cc
+++ b/chrome/browser/chromeos/dom_ui/stats_options_handler.cc
@@ -9,7 +9,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros_settings_names.h"
-#include "chrome/browser/chromeos/cros_settings_provider_stats.h"
+#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
 #include "chrome/browser/metrics/user_metrics.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index a464795..204ec6e 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -18,13 +18,13 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/cros_settings_provider_stats.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index fe77882..f102542 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ -28,6 +27,7 @@
 #include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/views/window.h"
diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc
index 8889bb2..eb5304d 100644
--- a/chrome/browser/chromeos/login/login_performer.cc
+++ b/chrome/browser/chromeos/login/login_performer.cc
@@ -9,8 +9,8 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 
diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc
index 6638c25..a20ea7f 100644
--- a/chrome/browser/chromeos/login/new_user_view.cc
+++ b/chrome/browser/chromeos/login/new_user_view.cc
@@ -20,11 +20,11 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/textfield_with_margin.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/views/copy_background.h"
 #include "gfx/font.h"
 #include "grit/app_resources.h"
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 0fcb805..a8b6401 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -11,7 +11,7 @@
 #include "app/resource_bundle.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/login/existing_user_view.h"
 #include "chrome/browser/chromeos/login/guest_user_view.h"
 #include "chrome/browser/chromeos/login/helper.h"
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index 1cb75fd..ada146e 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -19,8 +19,8 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/input_method_library.h"
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/chromeos/cros_settings_provider_stats.cc b/chrome/browser/chromeos/metrics_cros_settings_provider.cc
index 6a78f61..ba36cc2 100644
--- a/chrome/browser/chromeos/cros_settings_provider_stats.cc
+++ b/chrome/browser/chromeos/metrics_cros_settings_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros_settings_provider_stats.h"
+#include "chrome/browser/chromeos/metrics_cros_settings_provider.h"
 
 #include "base/string_util.h"
 #include "base/values.h"
diff --git a/chrome/browser/chromeos/cros_settings_provider_stats.h b/chrome/browser/chromeos/metrics_cros_settings_provider.h
index ff30f25..ad479ec 100644
--- a/chrome/browser/chromeos/cros_settings_provider_stats.h
+++ b/chrome/browser/chromeos/metrics_cros_settings_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_STATS_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_STATS_H_
+#ifndef CHROME_BROWSER_CHROMEOS_METRICS_CROS_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_CHROMEOS_METRICS_CROS_SETTINGS_PROVIDER_H_
 #pragma once
 
 #include <string>
@@ -38,4 +38,4 @@ class MetricsCrosSettingsProvider : public CrosSettingsProvider {
 
 };  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_STATS_H_
+#endif  // CHROME_BROWSER_CHROMEOS_METRICS_CROS_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/chromeos/cros_settings_provider_proxy.cc b/chrome/browser/chromeos/proxy_cros_settings_provider.cc
index 0ed7de9..cc4f586 100644
--- a/chrome/browser/chromeos/cros_settings_provider_proxy.cc
+++ b/chrome/browser/chromeos/proxy_cros_settings_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros_settings_provider_proxy.h"
+#include "chrome/browser/chromeos/proxy_cros_settings_provider.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_list.h"
@@ -26,11 +26,11 @@ static const char kProxySocks[]          = "cros.proxy.socks";
 static const char kProxySocksPort[]      = "cros.proxy.socksport";
 static const char kProxyIgnoreList[]     = "cros.proxy.ignorelist";
 
-//------------------ CrosSettingsProviderProxy: public methods -----------------
+//------------------ ProxyCrosSettingsProvider: public methods -----------------
 
-CrosSettingsProviderProxy::CrosSettingsProviderProxy() { }
+ProxyCrosSettingsProvider::ProxyCrosSettingsProvider() { }
 
-void CrosSettingsProviderProxy::DoSet(const std::string& path,
+void ProxyCrosSettingsProvider::DoSet(const std::string& path,
                                       Value* in_value) {
   if (!in_value) {
     return;
@@ -204,7 +204,7 @@ void CrosSettingsProviderProxy::DoSet(const std::string& path,
   }
 }
 
-bool CrosSettingsProviderProxy::Get(const std::string& path,
+bool ProxyCrosSettingsProvider::Get(const std::string& path,
                                     Value** out_value) const {
   bool found = false;
   bool managed = false;
@@ -278,14 +278,14 @@ bool CrosSettingsProviderProxy::Get(const std::string& path,
   }
 }
 
-bool CrosSettingsProviderProxy::HandlesSetting(const std::string& path) {
+bool ProxyCrosSettingsProvider::HandlesSetting(const std::string& path) {
   return ::StartsWithASCII(path, "cros.proxy", true);
 }
 
-//----------------- CrosSettingsProviderProxy: private methods -----------------
+//----------------- ProxyCrosSettingsProvider: private methods -----------------
 
 chromeos::ProxyConfigServiceImpl*
-    CrosSettingsProviderProxy::GetConfigService() const {
+    ProxyCrosSettingsProvider::GetConfigService() const {
   Browser* browser = BrowserList::GetLastActive();
   // browser is NULL at OOBE/login stage.
   Profile* profile = browser ?
@@ -294,7 +294,7 @@ chromeos::ProxyConfigServiceImpl*
   return profile->GetChromeOSProxyConfigServiceImpl();
 }
 
-void CrosSettingsProviderProxy::AppendPortIfValid(
+void ProxyCrosSettingsProvider::AppendPortIfValid(
     const char* port_cache_key,
     std::string* server_uri) {
   std::string port;
@@ -304,7 +304,7 @@ void CrosSettingsProviderProxy::AppendPortIfValid(
   }
 }
 
-void CrosSettingsProviderProxy::FormServerUriIfValid(
+void ProxyCrosSettingsProvider::FormServerUriIfValid(
     const char* host_cache_key,
     const std::string& port_num, std::string* server_uri) {
   if (cache_.GetString(host_cache_key, server_uri) && !server_uri->empty() &&
@@ -312,21 +312,21 @@ void CrosSettingsProviderProxy::FormServerUriIfValid(
     *server_uri += ":" + port_num;
 }
 
-Value* CrosSettingsProviderProxy::CreateServerHostValue(
+Value* ProxyCrosSettingsProvider::CreateServerHostValue(
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
   return proxy.server.is_valid() ?
          Value::CreateStringValue(proxy.server.host_port_pair().host()) :
          NULL;
 }
 
-Value* CrosSettingsProviderProxy::CreateServerPortValue(
+Value* ProxyCrosSettingsProvider::CreateServerPortValue(
     const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const {
   return proxy.server.is_valid() ?
          Value::CreateIntegerValue(proxy.server.host_port_pair().port()) :
          NULL;
 }
 
-void CrosSettingsProviderProxy::SetCache(const std::string& key,
+void ProxyCrosSettingsProvider::SetCache(const std::string& key,
     const Value* value) {
   cache_.Set(key, value->DeepCopy());
 }
diff --git a/chrome/browser/chromeos/cros_settings_provider_proxy.h b/chrome/browser/chromeos/proxy_cros_settings_provider.h
index 1b1672bc..d724815 100644
--- a/chrome/browser/chromeos/cros_settings_provider_proxy.h
+++ b/chrome/browser/chromeos/proxy_cros_settings_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_PROXY_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_PROXY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
 #pragma once
 
 #include "base/singleton.h"
@@ -13,9 +13,9 @@
 
 namespace chromeos {
 
-class CrosSettingsProviderProxy : public CrosSettingsProvider {
+class ProxyCrosSettingsProvider : public CrosSettingsProvider {
  public:
-  CrosSettingsProviderProxy();
+  ProxyCrosSettingsProvider();
   // CrosSettingsProvider implementation.
   virtual bool Get(const std::string& path, Value** out_value) const;
   virtual bool HandlesSetting(const std::string& path);
@@ -42,9 +42,9 @@ class CrosSettingsProviderProxy : public CrosSettingsProvider {
   // A cache to keep whatever user typed.
   DictionaryValue cache_;
 
-  DISALLOW_COPY_AND_ASSIGN(CrosSettingsProviderProxy);
+  DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_PROXY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/chromeos/cros_settings_provider_user.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc
index 36b06be..1cdfd3a 100644
--- a/chrome/browser/chromeos/cros_settings_provider_user.cc
+++ b/chrome/browser/chromeos/user_cros_settings_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/chromeos/cros_settings_provider_user.h b/chrome/browser/chromeos/user_cros_settings_provider.h
index 3fafa41..aa7db0f 100644
--- a/chrome/browser/chromeos/cros_settings_provider_user.h
+++ b/chrome/browser/chromeos/user_cros_settings_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_USER_H_
-#define CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_USER_H_
+#ifndef CHROME_BROWSER_CHROMEOS_USER_CROS_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_CHROMEOS_USER_CROS_SETTINGS_PROVIDER_H_
 #pragma once
 
 #include <string>
@@ -73,4 +73,4 @@ class UserCrosSettingsProvider : public CrosSettingsProvider,
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_CROS_SETTINGS_PROVIDER_USER_H_
+#endif  // CHROME_BROWSER_CHROMEOS_USER_CROS_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index ca75e38c..0572dbb 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -61,13 +61,13 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros_settings_provider_user.h"
 #include "chrome/browser/chromeos/login/apply_services_customization.h"
 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
+#include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #endif
 
 namespace browser {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e282142..c8a1ce2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -398,12 +398,6 @@
         'browser/chromeos/cros_settings_names.h',
         'browser/chromeos/cros_settings_provider.h',
         'browser/chromeos/cros_settings_provider.cc',
-        'browser/chromeos/cros_settings_provider_proxy.cc',
-        'browser/chromeos/cros_settings_provider_proxy.h',
-        'browser/chromeos/cros_settings_provider_stats.cc',
-        'browser/chromeos/cros_settings_provider_stats.h',
-        'browser/chromeos/cros_settings_provider_user.cc',
-        'browser/chromeos/cros_settings_provider_user.h',
         'browser/chromeos/cros/burn_library.cc',
         'browser/chromeos/cros/burn_library.h',
         'browser/chromeos/cros/cros_library.cc',
@@ -657,6 +651,8 @@
         'browser/chromeos/login/wizard_screen.h',
         'browser/chromeos/low_battery_observer.cc',
         'browser/chromeos/low_battery_observer.h',
+        'browser/chromeos/metrics_cros_settings_provider.cc',
+        'browser/chromeos/metrics_cros_settings_provider.h',
         'browser/chromeos/native_dialog_window.cc',
         'browser/chromeos/native_dialog_window.h',
         'browser/chromeos/native_theme_chromeos.cc',
@@ -715,6 +711,8 @@
         'browser/chromeos/proxy_config_service.h',
         'browser/chromeos/proxy_config_service_impl.cc',
         'browser/chromeos/proxy_config_service_impl.h',
+        'browser/chromeos/proxy_cros_settings_provider.cc',
+        'browser/chromeos/proxy_cros_settings_provider.h',
         'browser/chromeos/pulse_audio_mixer.cc',
         'browser/chromeos/pulse_audio_mixer.h',
         'browser/chromeos/status/clock_menu_button.cc',
@@ -746,6 +744,8 @@
         'browser/chromeos/update_observer.h',
         'browser/chromeos/usb_mount_observer.cc',
         'browser/chromeos/usb_mount_observer.h',
+        'browser/chromeos/user_cros_settings_provider.cc',
+        'browser/chromeos/user_cros_settings_provider.h',
         'browser/chromeos/version_loader.cc',
         'browser/chromeos/version_loader.h',
         'browser/chromeos/view_ids.h',