Move Chrome OS device settings stuff to chrome/browser/chromeos/settings.

chrome/chrome_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 477 matching lines @@
         'browser/chromeos/cros/network_parser.cc',
         'browser/chromeos/cros/network_parser.h',
         'browser/chromeos/cros/network_ui_data.cc',
         'browser/chromeos/cros/network_ui_data.h',
         'browser/chromeos/cros/onc_constants.cc',
         'browser/chromeos/cros/onc_constants.h',
         'browser/chromeos/cros/onc_network_parser.cc',
         'browser/chromeos/cros/onc_network_parser.h',
         'browser/chromeos/cros/sms_watcher.cc',
         'browser/chromeos/cros/sms_watcher.h',
-        'browser/chromeos/cros_settings.cc',
-        'browser/chromeos/cros_settings.h',
-        'browser/chromeos/cros_settings_names.cc',
-        'browser/chromeos/cros_settings_names.h',
-        'browser/chromeos/cros_settings_provider.cc',
-        'browser/chromeos/cros_settings_provider.h',
         'browser/chromeos/cryptohome/async_method_caller.cc',
         'browser/chromeos/cryptohome/async_method_caller.h',
         'browser/chromeos/customization_document.cc',
         'browser/chromeos/customization_document.h',
         'browser/chromeos/dbus/cros_dbus_service.cc',
         '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',
         'browser/chromeos/enrollment_dialog_view.h',
         'browser/chromeos/enterprise_extension_observer.cc',
         'browser/chromeos/enterprise_extension_observer.h',
         'browser/chromeos/extensions/bluetooth_event_router.cc',
         'browser/chromeos/extensions/bluetooth_event_router.h',
         'browser/chromeos/extensions/echo_private_api.cc',
         'browser/chromeos/extensions/echo_private_api.h',
@@ skipping 188 matching lines @@
         'browser/chromeos/login/network_screen_actor.h',
         'browser/chromeos/login/oauth1_token_fetcher.cc',
         'browser/chromeos/login/oauth1_token_fetcher.h',
         'browser/chromeos/login/oauth_login_verifier.cc',
         'browser/chromeos/login/oauth_login_verifier.h',
         'browser/chromeos/login/online_attempt.cc',
         'browser/chromeos/login/online_attempt.h',
         'browser/chromeos/login/online_attempt_host.cc',
         'browser/chromeos/login/online_attempt_host.h',
         'browser/chromeos/login/oobe_display.h',
-        'browser/chromeos/login/owner_key_utils.cc',
-        'browser/chromeos/login/owner_key_utils.h',
-        'browser/chromeos/login/owner_manager.cc',
-        'browser/chromeos/login/owner_manager.h',
-        'browser/chromeos/login/ownership_service.cc',
-        'browser/chromeos/login/ownership_service.h',
         'browser/chromeos/login/parallel_authenticator.cc',
         'browser/chromeos/login/parallel_authenticator.h',
         'browser/chromeos/login/password_changed_view.cc',
         'browser/chromeos/login/password_changed_view.h',
         'browser/chromeos/login/policy_oauth_fetcher.cc',
         'browser/chromeos/login/policy_oauth_fetcher.h',
         'browser/chromeos/login/proxy_settings_dialog.cc',
         'browser/chromeos/login/proxy_settings_dialog.h',
         'browser/chromeos/login/registration_screen.cc',
         'browser/chromeos/login/registration_screen.h',
         'browser/chromeos/login/remove_user_delegate.h',
         'browser/chromeos/login/rounded_rect_painter.cc',
         'browser/chromeos/login/rounded_rect_painter.h',
         'browser/chromeos/login/screen_locker.cc',
         'browser/chromeos/login/screen_locker.h',
         'browser/chromeos/login/screen_locker_delegate.cc',
         'browser/chromeos/login/screen_locker_delegate.h',
         'browser/chromeos/login/screen_observer.h',
-        'browser/chromeos/login/session_manager_observer.cc',
-        'browser/chromeos/login/session_manager_observer.h',
-        'browser/chromeos/login/signed_settings.cc',
-        'browser/chromeos/login/signed_settings.h',
-        'browser/chromeos/login/signed_settings_cache.cc',
-        'browser/chromeos/login/signed_settings_cache.h',
-        'browser/chromeos/login/signed_settings_helper.cc',
-        'browser/chromeos/login/signed_settings_helper.h',
         'browser/chromeos/login/simple_web_view_dialog.cc',
         'browser/chromeos/login/simple_web_view_dialog.h',
         'browser/chromeos/login/take_photo_view.cc',
         'browser/chromeos/login/take_photo_view.h',
         'browser/chromeos/login/test_attempt_state.cc',
         'browser/chromeos/login/test_attempt_state.h',
         'browser/chromeos/login/textfield_with_margin.cc',
         'browser/chromeos/login/textfield_with_margin.h',
         'browser/chromeos/login/tpm_password_fetcher.cc',
         'browser/chromeos/login/tpm_password_fetcher.h',
@@ skipping 103 matching lines @@
         'browser/chromeos/process_proxy/process_proxy.cc',
         'browser/chromeos/process_proxy/process_proxy.h',
         'browser/chromeos/process_proxy/process_proxy_registry.cc',
         'browser/chromeos/process_proxy/process_proxy_registry.h',
         'browser/chromeos/profile_startup.cc',
         'browser/chromeos/profile_startup.h',
         'browser/chromeos/proxy_config_service_impl.cc',
         'browser/chromeos/proxy_config_service_impl.h',
         'browser/chromeos/proxy_cros_settings_parser.cc',
         'browser/chromeos/proxy_cros_settings_parser.h',
-        'browser/chromeos/signed_settings_migration_helper.cc',
-        'browser/chromeos/signed_settings_migration_helper.h',
+        'browser/chromeos/settings/cros_settings.cc',
+        'browser/chromeos/settings/cros_settings.h',
+        'browser/chromeos/settings/cros_settings_names.cc',
+        'browser/chromeos/settings/cros_settings_names.h',
+        'browser/chromeos/settings/cros_settings_provider.cc',
+        'browser/chromeos/settings/cros_settings_provider.h',
+        'browser/chromeos/settings/device_settings_provider.cc',
+        'browser/chromeos/settings/device_settings_provider.h',
+        'browser/chromeos/settings/owner_key_utils.cc',
+        'browser/chromeos/settings/owner_key_utils.h',
+        'browser/chromeos/settings/owner_manager.cc',
+        'browser/chromeos/settings/owner_manager.h',
+        'browser/chromeos/settings/ownership_service.cc',
+        'browser/chromeos/settings/ownership_service.h',
+        'browser/chromeos/settings/session_manager_observer.cc',
+        'browser/chromeos/settings/session_manager_observer.h',
+        'browser/chromeos/settings/signed_settings.cc',
+        'browser/chromeos/settings/signed_settings.h',
+        'browser/chromeos/settings/signed_settings_cache.cc',
+        'browser/chromeos/settings/signed_settings_cache.h',
+        'browser/chromeos/settings/signed_settings_helper.cc',
+        'browser/chromeos/settings/signed_settings_helper.h',
+        'browser/chromeos/settings/signed_settings_migration_helper.cc',
+        'browser/chromeos/settings/signed_settings_migration_helper.h',
+        'browser/chromeos/settings/stub_cros_settings_provider.cc',
+        'browser/chromeos/settings/stub_cros_settings_provider.h',
+        'browser/chromeos/settings/system_settings_provider.cc',
+        'browser/chromeos/settings/system_settings_provider.h',
         'browser/chromeos/sim_dialog_delegate.cc',
         'browser/chromeos/sim_dialog_delegate.h',
         'browser/chromeos/sms_observer.cc',
         'browser/chromeos/sms_observer.h',
         'browser/chromeos/status/data_promo_notification.cc',
         'browser/chromeos/status/data_promo_notification.h',
         'browser/chromeos/status/network_menu.cc',
         'browser/chromeos/status/network_menu.h',
         'browser/chromeos/status/network_menu_icon.cc',
         'browser/chromeos/status/network_menu_icon.h',
-        'browser/chromeos/stub_cros_settings_provider.cc',
-        'browser/chromeos/stub_cros_settings_provider.h',
         'browser/chromeos/system/ash_system_tray_delegate.cc',
         'browser/chromeos/system/ash_system_tray_delegate.h',
         'browser/chromeos/system/drm_settings.cc',
         'browser/chromeos/system/drm_settings.h',
         'browser/chromeos/system/input_device_settings.cc',
         'browser/chromeos/system/input_device_settings.h',
         'browser/chromeos/system/name_value_pairs_parser.cc',
         'browser/chromeos/system/name_value_pairs_parser.h',
         'browser/chromeos/system/pointer_device_observer.cc',
         'browser/chromeos/system/pointer_device_observer.h',
         'browser/chromeos/system/power_manager_settings.cc',
         'browser/chromeos/system/power_manager_settings.h',
         'browser/chromeos/system/statistics_provider.cc',
         'browser/chromeos/system/statistics_provider.h',
         'browser/chromeos/system/sysinfo_provider.cc',
         'browser/chromeos/system/sysinfo_provider.h',
         'browser/chromeos/system/syslogs_provider.cc',
         'browser/chromeos/system/syslogs_provider.h',
         'browser/chromeos/system/timezone_settings.cc',
         'browser/chromeos/system/timezone_settings.h',
         'browser/chromeos/system/udev_info_provider.cc',
         '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/version_loader.cc',
         'browser/chromeos/version_loader.h',
         'browser/chromeos/view_ids.h',
         'browser/chromeos/web_socket_proxy.cc',
         'browser/chromeos/web_socket_proxy.h',
         'browser/chromeos/web_socket_proxy_controller.cc',
@@ skipping 4561 matching lines @@
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }