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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/
Patch Set: Created 7 years, 6 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.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
===================================================================
--- chrome/chrome_tests_unit.gypi (revision 208727)
+++ chrome/chrome_tests_unit.gypi (working copy)
@@ -931,9 +931,9 @@
'browser/importer/safari_importer_unittest.mm',
'browser/importer/toolbar_importer_unittest.cc',
'browser/internal_auth_unittest.cc',
+ 'browser/invalidation/invalidation_frontend_test_template.cc',
+ 'browser/invalidation/invalidation_frontend_test_template.h',
'browser/invalidation/invalidation_service_android_unittest.cc',
- 'browser/invalidation/invalidation_service_test_template.cc',
- 'browser/invalidation/invalidation_service_test_template.h',
'browser/invalidation/invalidator_storage_unittest.cc',
'browser/invalidation/ticl_invalidation_service_unittest.cc',
'browser/language_usage_metrics_unittest.cc',
@@ -1193,6 +1193,8 @@
'browser/sync/abstract_profile_sync_service_test.cc',
'browser/sync/abstract_profile_sync_service_test.h',
'browser/sync/backend_migrator_unittest.cc',
+ 'browser/sync/glue/android_invalidator_bridge_proxy_unittest.cc',
+ 'browser/sync/glue/android_invalidator_bridge_unittest.cc',
'browser/sync/glue/autofill_data_type_controller_unittest.cc',
'browser/sync/glue/bookmark_data_type_controller_unittest.cc',
'browser/sync/glue/browser_thread_model_worker_unittest.cc',
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698