Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 97db6d5694cadde331b332eab5326f910ed14c1a..67dd25201a7ce64b3b1b49d6ef26d00e50462c16 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -107,12 +107,12 @@ |
'browser/chromeos/login/mock_login_status_consumer.h', |
'browser/chromeos/login/mock_login_utils.cc', |
'browser/chromeos/login/mock_login_utils.h', |
- 'browser/chromeos/login/mock_signed_settings_helper.cc', |
- 'browser/chromeos/login/mock_signed_settings_helper.h', |
'browser/chromeos/login/mock_url_fetchers.cc', |
'browser/chromeos/login/mock_url_fetchers.h', |
'browser/chromeos/login/mock_user_manager.cc', |
'browser/chromeos/login/mock_user_manager.h', |
+ 'browser/chromeos/settings/mock_signed_settings_helper.cc', |
+ 'browser/chromeos/settings/mock_signed_settings_helper.h', |
# The only thing used from browser is Browser::Type. |
'browser/extensions/mock_extension_special_storage_policy.cc', |
'browser/extensions/mock_extension_special_storage_policy.h', |
@@ -1088,13 +1088,11 @@ |
'browser/chromeos/cros/network_library_unittest.cc', |
'browser/chromeos/cros/network_ui_data_unittest.cc', |
'browser/chromeos/cros/onc_network_parser_unittest.cc', |
- 'browser/chromeos/cros_settings_unittest.cc', |
'browser/chromeos/customization_document_unittest.cc', |
'browser/chromeos/disks/mock_disk_mount_manager.cc', |
'browser/chromeos/disks/mock_disk_mount_manager.h', |
'browser/chromeos/dbus/cros_dbus_service_unittest.cc', |
'browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc', |
- 'browser/chromeos/device_settings_provider_unittest.cc', |
'browser/chromeos/extensions/file_browser_notifications_unittest.cc', |
'browser/chromeos/external_metrics_unittest.cc', |
'browser/chromeos/gdata/drive_api_parser_unittest.cc', |
@@ -1142,18 +1140,8 @@ |
'browser/chromeos/language_preferences_unittest.cc', |
'browser/chromeos/login/mock_auth_attempt_state_resolver.cc', |
'browser/chromeos/login/mock_auth_attempt_state_resolver.h', |
- 'browser/chromeos/login/mock_owner_key_utils.cc', |
- 'browser/chromeos/login/mock_owner_key_utils.h', |
- 'browser/chromeos/login/mock_ownership_service.cc', |
- 'browser/chromeos/login/mock_ownership_service.h', |
'browser/chromeos/login/online_attempt_unittest.cc', |
- 'browser/chromeos/login/owner_key_utils_unittest.cc', |
- 'browser/chromeos/login/owner_manager_unittest.cc', |
- 'browser/chromeos/login/ownership_service_unittest.cc', |
'browser/chromeos/login/parallel_authenticator_unittest.cc', |
- 'browser/chromeos/login/signed_settings_cache_unittest.cc', |
- 'browser/chromeos/login/signed_settings_helper_unittest.cc', |
- 'browser/chromeos/login/signed_settings_unittest.cc', |
'browser/chromeos/login/user_manager_unittest.cc', |
'browser/chromeos/mobile_config_unittest.cc', |
'browser/chromeos/network_message_observer_unittest.cc', |
@@ -1162,9 +1150,21 @@ |
'browser/chromeos/preferences_unittest.cc', |
'browser/chromeos/process_proxy/process_output_watcher_unittest.cc', |
'browser/chromeos/proxy_config_service_impl_unittest.cc', |
+ 'browser/chromeos/settings/cros_settings_unittest.cc', |
+ 'browser/chromeos/settings/device_settings_provider_unittest.cc', |
+ 'browser/chromeos/settings/mock_owner_key_utils.cc', |
+ 'browser/chromeos/settings/mock_owner_key_utils.h', |
+ 'browser/chromeos/settings/mock_ownership_service.cc', |
+ 'browser/chromeos/settings/mock_ownership_service.h', |
+ 'browser/chromeos/settings/owner_key_utils_unittest.cc', |
+ 'browser/chromeos/settings/owner_manager_unittest.cc', |
+ 'browser/chromeos/settings/ownership_service_unittest.cc', |
+ 'browser/chromeos/settings/signed_settings_cache_unittest.cc', |
+ 'browser/chromeos/settings/signed_settings_helper_unittest.cc', |
+ 'browser/chromeos/settings/signed_settings_unittest.cc', |
+ 'browser/chromeos/settings/stub_cros_settings_provider_unittest.cc', |
'browser/chromeos/status/network_menu_icon.cc', |
'browser/chromeos/status/network_menu_icon_unittest.cc', |
- 'browser/chromeos/stub_cros_settings_provider_unittest.cc', |
'browser/chromeos/system/mock_statistics_provider.cc', |
'browser/chromeos/system/mock_statistics_provider.h', |
'browser/chromeos/system/name_value_pairs_parser_unittest.cc', |