Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 4fba7365c14d21e791479daf0da2c2c799ea5c03..c0a27d2a5e9f0269a0f65a4fd32605f34f4af964 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -3492,20 +3492,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', |
@@ -3516,32 +3512,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', |
@@ -3634,12 +3634,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', |
@@ -3657,6 +3655,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', { |