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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Rebase 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
« no previous file with comments | « no previous file | chrome/test/live_sync/bookmark_model_verifier.h » ('j') | chrome/test/live_sync/bookmarks_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fb3cab33de2fa243b311a820bf29b23a9c011c49..39f96b892e07554e7bdd1ff50fe7cc0b202dde6c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3487,20 +3487,16 @@
'browser/sessions/session_backend.cc',
'browser/sync/glue/session_model_associator.cc',
'test/out_of_proc_test_runner.cc',
- 'test/live_sync/bookmark_model_verifier.cc',
- 'test/live_sync/bookmark_model_verifier.h',
+ 'test/live_sync/bookmarks_helper.cc',
+ 'test/live_sync/bookmarks_helper.h',
'test/live_sync/live_apps_sync_test.cc',
'test/live_sync/live_apps_sync_test.h',
'test/live_sync/live_autofill_sync_test.cc',
'test/live_sync/live_autofill_sync_test.h',
- 'test/live_sync/live_bookmarks_sync_test.cc',
- 'test/live_sync/live_bookmarks_sync_test.h',
'test/live_sync/live_extensions_sync_test.cc',
'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',
@@ -3511,32 +3507,36 @@
'test/live_sync/live_sync_extension_helper.h',
'test/live_sync/live_sync_test.cc',
'test/live_sync/live_sync_test.h',
- 'test/live_sync/many_client_live_bookmarks_sync_test.cc',
+ 'test/live_sync/many_client_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_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/preferences_helper.cc',
+ 'test/live_sync/preferences_helper.h',
+ 'test/live_sync/single_client_bookmarks_sync_test.cc',
'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/sync_datatype_helper.cc',
+ 'test/live_sync/sync_datatype_helper.h',
+ 'test/live_sync/two_client_bookmarks_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',
@@ -3629,12 +3629,10 @@
'sources': [
'browser/password_manager/password_form_data.cc',
'test/out_of_proc_test_runner.cc',
- 'test/live_sync/bookmark_model_verifier.cc',
- 'test/live_sync/bookmark_model_verifier.h',
+ 'test/live_sync/bookmarks_helper.cc',
+ 'test/live_sync/bookmarks_helper.h',
'test/live_sync/live_autofill_sync_test.cc',
'test/live_sync/live_autofill_sync_test.h',
- 'test/live_sync/live_bookmarks_sync_test.cc',
- 'test/live_sync/live_bookmarks_sync_test.h',
'test/live_sync/live_extensions_sync_test.cc',
'test/live_sync/live_extensions_sync_test.h',
'test/live_sync/live_passwords_sync_test.cc',
@@ -3652,6 +3650,8 @@
'test/live_sync/performance/sync_timing_helper.h',
'test/live_sync/performance/passwords_sync_perf_test.cc',
'test/live_sync/performance/typed_urls_sync_perf_test.cc',
+ 'test/live_sync/sync_datatype_helper.cc',
+ 'test/live_sync/sync_datatype_helper.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
« no previous file with comments | « no previous file | chrome/test/live_sync/bookmark_model_verifier.h » ('j') | chrome/test/live_sync/bookmarks_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698