Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1917)

Unified Diff: chrome/chrome_tests.gypi

Issue 10918027: Revert 154457 - Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 154482)
+++ chrome/chrome_tests.gypi (working copy)
@@ -109,10 +109,6 @@
'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.
@@ -1181,6 +1177,10 @@
'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',
@@ -1190,6 +1190,7 @@
'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',
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698