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

Unified Diff: chrome/chrome_tests.gypi

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, remove blocking GetOwnershipStatus() 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e5da0babc4548eea033a471af8bac54d28716199..fdddc561806dd8d84236314cf8e850af454db781 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -111,6 +111,10 @@
'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.
@@ -1161,10 +1165,6 @@
'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',
@@ -1173,7 +1173,6 @@
'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',

Powered by Google App Engine
This is Rietveld 408576698