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

Unified Diff: chrome/chrome_tests.gypi

Issue 7259005: Allow sync integration tests to operate on multiple datatypes: Preferences + Bookmarks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Actual patch set. (Moves show up as adds / deletes. Hard to review) Created 9 years, 5 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 1c3c4ad16da217ed26bb37f47d57a917e22f656f..1db1caf3a282a86cd8a84db7ba0a9770a2af90c5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3398,8 +3398,6 @@
'test/live_sync/live_extensions_sync_test.h',
'test/live_sync/live_passwords_sync_test.cc',
'test/live_sync/live_passwords_sync_test.h',
- 'test/live_sync/live_preferences_sync_test.cc',
- 'test/live_sync/live_preferences_sync_test.h',
'test/live_sync/live_sessions_sync_test.cc',
'test/live_sync/live_sessions_sync_test.h',
'test/live_sync/live_themes_sync_test.cc',
@@ -3414,33 +3412,35 @@
'test/live_sync/live_sync_timing_helper.h',
'test/live_sync/many_client_live_bookmarks_sync_test.cc',
'test/live_sync/many_client_live_passwords_sync_test.cc',
- 'test/live_sync/many_client_live_preferences_sync_test.cc',
+ 'test/live_sync/many_client_preferences_sync_test.cc',
'test/live_sync/migration_errors_test.cc',
'test/live_sync/multiple_client_live_bookmarks_sync_test.cc',
'test/live_sync/multiple_client_live_passwords_sync_test.cc',
- 'test/live_sync/multiple_client_live_preferences_sync_test.cc',
'test/live_sync/multiple_client_live_sessions_sync_test.cc',
'test/live_sync/multiple_client_live_typed_urls_sync_test.cc',
+ 'test/live_sync/multiple_client_preferences_sync_test.cc',
'test/live_sync/performance_live_autofill_sync_test.cc',
'test/live_sync/performance_live_bookmarks_sync_test.cc',
'test/live_sync/performance_live_extensions_sync_test.cc',
+ 'test/live_sync/preferences_helper.cc',
+ 'test/live_sync/preferences_helper.h',
'test/live_sync/single_client_live_apps_sync_test.cc',
'test/live_sync/single_client_live_bookmarks_sync_test.cc',
'test/live_sync/single_client_live_extensions_sync_test.cc',
'test/live_sync/single_client_live_passwords_sync_test.cc',
- 'test/live_sync/single_client_live_preferences_sync_test.cc',
'test/live_sync/single_client_live_sessions_sync_test.cc',
'test/live_sync/single_client_live_themes_sync_test.cc',
'test/live_sync/single_client_live_typed_urls_sync_test.cc',
+ 'test/live_sync/single_client_preferences_sync_test.cc',
'test/live_sync/two_client_live_apps_sync_test.cc',
'test/live_sync/two_client_live_autofill_sync_test.cc',
'test/live_sync/two_client_live_bookmarks_sync_test.cc',
'test/live_sync/two_client_live_extensions_sync_test.cc',
- 'test/live_sync/two_client_live_preferences_sync_test.cc',
'test/live_sync/two_client_live_passwords_sync_test.cc',
'test/live_sync/two_client_live_sessions_sync_test.cc',
'test/live_sync/two_client_live_themes_sync_test.cc',
'test/live_sync/two_client_live_typed_urls_sync_test.cc',
+ 'test/live_sync/two_client_preferences_sync_test.cc',
'test/test_notification_tracker.cc',
'test/test_notification_tracker.h',
'test/ui_test_utils_linux.cc',
« no previous file with comments | « no previous file | chrome/test/live_sync/live_preferences_sync_test.h » ('j') | chrome/test/live_sync/live_sync_test.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698