Moving system_settings_provider2 to src/chrome/browser/chromeos

BUG=chromium-os:27206
TEST=nothing breaks

Review URL: https://chromiumcodereview.appspot.com/10694104

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

6 files changed, 14 insertions, 19 deletions

diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc
index df4e065f..98402dc 100644
--- a/chrome/browser/chromeos/cros_settings.cc
+++ b/chrome/browser/chromeos/cros_settings.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/chromeos/device_settings_provider.h"
 #include "chrome/browser/chromeos/login/signed_settings_helper.h"
 #include "chrome/browser/chromeos/stub_cros_settings_provider.h"
-#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
+#include "chrome/browser/chromeos/system_settings_provider.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_auth_util.h"
@@ -304,7 +304,7 @@ CrosSettings::CrosSettings() {
         new DeviceSettingsProvider(notify_cb, SignedSettingsHelper::Get()));
   }
   // System settings are not mocked currently.
-  AddSettingsProvider(new options2::SystemSettingsProvider(notify_cb));
+  AddSettingsProvider(new SystemSettingsProvider(notify_cb));
 }
 
 CrosSettings::~CrosSettings() {
diff --git a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc b/chrome/browser/chromeos/system_settings_provider.cc
index d43bde4..0ebcc29 100644
--- a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc
+++ b/chrome/browser/chromeos/system_settings_provider.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
+#include "chrome/browser/chromeos/system_settings_provider.h"
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ -179,7 +178,6 @@ string16 GetExemplarCity(const icu::TimeZone& zone) {
 }  // namespace anonymous
 
 namespace chromeos {
-namespace options2 {
 
 SystemSettingsProvider::SystemSettingsProvider(
     const NotifyObserversCallback& notify_cb)
@@ -328,5 +326,4 @@ string16 SystemSettingsProvider::GetKnownTimezoneID(
   return string16();
 }
 
-}  // namespace options2
 }  // namespace chromeos
diff --git a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h b/chrome/browser/chromeos/system_settings_provider.h
index 25a523c..2e5b3fe 100644
--- a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h
+++ b/chrome/browser/chromeos/system_settings_provider.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER2_H_
+#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
+#define CHROME_BROWSER_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros_settings_provider.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
@@ -20,7 +21,6 @@ class Value;
 }
 
 namespace chromeos {
-namespace options2 {
 
 class SystemSettingsProvider : public CrosSettingsProvider,
                                public system::TimezoneSettings::Observer {
@@ -72,7 +72,6 @@ class SystemSettingsProvider : public CrosSettingsProvider,
   DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider);
 };
 
-}  // namespace options2
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_CHROMEOS_SYSTEM_SETTINGS_PROVIDER2_H_
+#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_SETTINGS_PROVIDER_H_
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 4ccf5f5..abe3609 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -86,8 +86,8 @@
 #include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
+#include "chrome/browser/chromeos/system_settings_provider.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
 #include "ui/gfx/image/image_skia.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ -388,7 +388,7 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
   // TODO(pastarmovj): replace this with a call to the CrosSettings list
   // handling functionality to come.
   values->Set("timezoneList",
-      static_cast<chromeos::options2::SystemSettingsProvider*>(
+      static_cast<chromeos::SystemSettingsProvider*>(
           chromeos::CrosSettings::Get()->GetProvider(
               chromeos::kSystemTimezone))->GetTimezoneList());
 #endif
diff --git a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc
index 73c6088..e5a7a64 100644
--- a/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc
@@ -13,7 +13,6 @@
 #include "base/values.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
-#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 420dbf9..1cf8c05 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -498,6 +498,9 @@
         'browser/chromeos/dbus/cros_dbus_service.h',
         'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
         'browser/chromeos/dbus/proxy_resolution_service_provider.h',
+        'browser/chromeos/device_hierarchy_observer.h',
+        'browser/chromeos/device_settings_provider.cc',
+        'browser/chromeos/device_settings_provider.h',
         'browser/chromeos/disks/disk_mount_manager.cc',
         'browser/chromeos/disks/disk_mount_manager.h',
         'browser/chromeos/enrollment_dialog_view.cc',
@@ -890,13 +893,12 @@
         'browser/chromeos/system/udev_info_provider.h',
         'browser/chromeos/system_key_event_listener.cc',
         'browser/chromeos/system_key_event_listener.h',
+        'browser/chromeos/system_settings_provider.cc',
+        'browser/chromeos/system_settings_provider.h',
         'browser/chromeos/ui/idle_logout_dialog_view.cc',
         'browser/chromeos/ui/idle_logout_dialog_view.h',
         'browser/chromeos/upgrade_detector_chromeos.cc',
         'browser/chromeos/upgrade_detector_chromeos.h',
-        'browser/chromeos/device_hierarchy_observer.h',
-        'browser/chromeos/device_settings_provider.cc',
-        'browser/chromeos/device_settings_provider.h',
         'browser/chromeos/version_loader.cc',
         'browser/chromeos/version_loader.h',
         'browser/chromeos/view_ids.h',
@@ -4047,8 +4049,6 @@
         'browser/ui/webui/options2/chromeos/set_wallpaper_options_handler2.h',
         'browser/ui/webui/options2/chromeos/stats_options_handler2.cc',
         'browser/ui/webui/options2/chromeos/stats_options_handler2.h',
-        'browser/ui/webui/options2/chromeos/system_settings_provider2.cc',
-        'browser/ui/webui/options2/chromeos/system_settings_provider2.h',
         'browser/ui/webui/options2/chromeos/user_image_source2.cc',
         'browser/ui/webui/options2/chromeos/user_image_source2.h',
         'browser/ui/webui/options2/chromeos/wallpaper_source2.cc',