Revert 154457 - Switch from SignedSettings to DeviceSettingsService.

chrome/chrome_tests.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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 91 matching lines @@
         'browser/chromeos/input_method/mock_xkeyboard.cc',
         'browser/chromeos/input_method/mock_xkeyboard.h',
         'browser/chromeos/login/mock_login_status_consumer.cc',
         '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_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/device_settings_test_helper.cc',
-        'browser/chromeos/settings/device_settings_test_helper.h',
-        'browser/chromeos/settings/mock_owner_key_util.cc',
-        'browser/chromeos/settings/mock_owner_key_util.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/download/download_test_file_chooser_observer.cc',
         'browser/download/download_test_file_chooser_observer.h',
         'browser/extensions/mock_extension_special_storage_policy.cc',
         'browser/extensions/mock_extension_special_storage_policy.h',
         'browser/extensions/test_extension_prefs.cc',
         'browser/extensions/test_extension_prefs.h',
         'browser/extensions/test_extension_service.cc',
@@ skipping 1048 matching lines @@
         'browser/chromeos/mobile_config_unittest.cc',
         'browser/chromeos/network_message_observer_unittest.cc',
         'browser/chromeos/offline/offline_load_page_unittest.cc',
         'browser/chromeos/oom_priority_manager_unittest.cc',
         '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/device_settings_service_unittest.cc',
+        'browser/chromeos/settings/device_settings_test_helper.cc',
+        'browser/chromeos/settings/device_settings_test_helper.h',
+        'browser/chromeos/settings/mock_owner_key_util.cc',
+        'browser/chromeos/settings/mock_owner_key_util.h',
         '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_util_unittest.cc',
         'browser/chromeos/settings/owner_key_utils_unittest.cc',
         'browser/chromeos/settings/owner_manager_unittest.cc',
         'browser/chromeos/settings/session_manager_operation_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/system/mock_statistics_provider.cc',
         'browser/chromeos/system/mock_statistics_provider.h',
         'browser/chromeos/system/name_value_pairs_parser_unittest.cc',
         'browser/chromeos/system_logs/lsb_release_log_source_unittest.cc',
         'browser/chromeos/version_loader_unittest.cc',
@@ skipping 3548 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }