Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index f64d505b601e1b969b29179cd15c20ab04094b83..0c0df0e04e2e6afcbd4729f7970cc151651489ff 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -3276,57 +3276,57 @@ |
'test/base/test_notification_tracker.cc', |
'test/base/test_notification_tracker.h', |
'test/data/resource.rc', |
- 'browser/sync/test/live_sync/apps_helper.cc', |
- 'browser/sync/test/live_sync/apps_helper.h', |
- 'browser/sync/test/live_sync/autofill_helper.cc', |
- 'browser/sync/test/live_sync/autofill_helper.h', |
- 'browser/sync/test/live_sync/bookmarks_helper.cc', |
- 'browser/sync/test/live_sync/bookmarks_helper.h', |
- 'browser/sync/test/live_sync/extensions_helper.cc', |
- 'browser/sync/test/live_sync/extensions_helper.h', |
- 'browser/sync/test/live_sync/live_sync_test.cc', |
- 'browser/sync/test/live_sync/live_sync_test.h', |
- 'browser/sync/test/live_sync/many_client_bookmarks_sync_test.cc', |
- 'browser/sync/test/live_sync/many_client_passwords_sync_test.cc', |
- 'browser/sync/test/live_sync/many_client_preferences_sync_test.cc', |
- 'browser/sync/test/live_sync/migration_errors_test.cc', |
- 'browser/sync/test/live_sync/multiple_client_bookmarks_sync_test.cc', |
- 'browser/sync/test/live_sync/multiple_client_passwords_sync_test.cc', |
- 'browser/sync/test/live_sync/multiple_client_preferences_sync_test.cc', |
- 'browser/sync/test/live_sync/multiple_client_sessions_sync_test.cc', |
- 'browser/sync/test/live_sync/multiple_client_typed_urls_sync_test.cc', |
- 'browser/sync/test/live_sync/passwords_helper.cc', |
- 'browser/sync/test/live_sync/passwords_helper.h', |
- 'browser/sync/test/live_sync/preferences_helper.cc', |
- 'browser/sync/test/live_sync/preferences_helper.h', |
- 'browser/sync/test/live_sync/sessions_helper.cc', |
- 'browser/sync/test/live_sync/sessions_helper.h', |
- 'browser/sync/test/live_sync/single_client_apps_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_bookmarks_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_extensions_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_passwords_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_preferences_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_sessions_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_themes_sync_test.cc', |
- 'browser/sync/test/live_sync/single_client_typed_urls_sync_test.cc', |
- 'browser/sync/test/live_sync/sync_datatype_helper.cc', |
- 'browser/sync/test/live_sync/sync_datatype_helper.h', |
- 'browser/sync/test/live_sync/sync_errors_test.cc', |
- 'browser/sync/test/live_sync/sync_extension_helper.cc', |
- 'browser/sync/test/live_sync/sync_extension_helper.h', |
- 'browser/sync/test/live_sync/themes_helper.cc', |
- 'browser/sync/test/live_sync/themes_helper.h', |
- 'browser/sync/test/live_sync/two_client_apps_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_autofill_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_bookmarks_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_extensions_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_passwords_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_preferences_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_sessions_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_themes_sync_test.cc', |
- 'browser/sync/test/live_sync/two_client_typed_urls_sync_test.cc', |
- 'browser/sync/test/live_sync/typed_urls_helper.cc', |
- 'browser/sync/test/live_sync/typed_urls_helper.h', |
+ 'browser/sync/test/integration/apps_helper.cc', |
+ 'browser/sync/test/integration/apps_helper.h', |
+ 'browser/sync/test/integration/autofill_helper.cc', |
+ 'browser/sync/test/integration/autofill_helper.h', |
+ 'browser/sync/test/integration/bookmarks_helper.cc', |
+ 'browser/sync/test/integration/bookmarks_helper.h', |
+ 'browser/sync/test/integration/extensions_helper.cc', |
+ 'browser/sync/test/integration/extensions_helper.h', |
+ 'browser/sync/test/integration/many_client_bookmarks_sync_test.cc', |
+ 'browser/sync/test/integration/many_client_passwords_sync_test.cc', |
+ 'browser/sync/test/integration/many_client_preferences_sync_test.cc', |
+ 'browser/sync/test/integration/migration_errors_test.cc', |
+ 'browser/sync/test/integration/multiple_client_bookmarks_sync_test.cc', |
+ 'browser/sync/test/integration/multiple_client_passwords_sync_test.cc', |
+ 'browser/sync/test/integration/multiple_client_preferences_sync_test.cc', |
+ 'browser/sync/test/integration/multiple_client_sessions_sync_test.cc', |
+ 'browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc', |
+ 'browser/sync/test/integration/passwords_helper.cc', |
+ 'browser/sync/test/integration/passwords_helper.h', |
+ 'browser/sync/test/integration/preferences_helper.cc', |
+ 'browser/sync/test/integration/preferences_helper.h', |
+ 'browser/sync/test/integration/sessions_helper.cc', |
+ 'browser/sync/test/integration/sessions_helper.h', |
+ 'browser/sync/test/integration/single_client_apps_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_bookmarks_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_extensions_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_passwords_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_preferences_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_sessions_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_themes_sync_test.cc', |
+ 'browser/sync/test/integration/single_client_typed_urls_sync_test.cc', |
+ 'browser/sync/test/integration/sync_datatype_helper.cc', |
+ 'browser/sync/test/integration/sync_datatype_helper.h', |
+ 'browser/sync/test/integration/sync_errors_test.cc', |
+ 'browser/sync/test/integration/sync_extension_helper.cc', |
+ 'browser/sync/test/integration/sync_extension_helper.h', |
+ 'browser/sync/test/integration/sync_test.cc', |
+ 'browser/sync/test/integration/sync_test.h', |
+ 'browser/sync/test/integration/themes_helper.cc', |
+ 'browser/sync/test/integration/themes_helper.h', |
+ 'browser/sync/test/integration/two_client_apps_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_autofill_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_bookmarks_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_extensions_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_passwords_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_preferences_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_sessions_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_themes_sync_test.cc', |
+ 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', |
+ 'browser/sync/test/integration/typed_urls_helper.cc', |
+ 'browser/sync/test/integration/typed_urls_helper.h', |
], |
'conditions': [ |
['toolkit_uses_gtk == 1', { |
@@ -3419,32 +3419,32 @@ |
'browser/password_manager/password_form_data.cc', |
'browser/sessions/session_backend.cc', |
'browser/sync/glue/session_model_associator.cc', |
- 'browser/sync/test/live_sync/autofill_helper.cc', |
- 'browser/sync/test/live_sync/autofill_helper.h', |
- 'browser/sync/test/live_sync/bookmarks_helper.cc', |
- 'browser/sync/test/live_sync/bookmarks_helper.h', |
- 'browser/sync/test/live_sync/extensions_helper.cc', |
- 'browser/sync/test/live_sync/extensions_helper.h', |
- 'browser/sync/test/live_sync/live_sync_test.cc', |
- 'browser/sync/test/live_sync/live_sync_test.h', |
- 'browser/sync/test/live_sync/passwords_helper.cc', |
- 'browser/sync/test/live_sync/passwords_helper.h', |
- 'browser/sync/test/live_sync/performance/autofill_sync_perf_test.cc', |
- 'browser/sync/test/live_sync/performance/bookmarks_sync_perf_test.cc', |
- 'browser/sync/test/live_sync/performance/extensions_sync_perf_test.cc', |
- 'browser/sync/test/live_sync/performance/sync_timing_helper.cc', |
- 'browser/sync/test/live_sync/performance/sync_timing_helper.h', |
- 'browser/sync/test/live_sync/performance/passwords_sync_perf_test.cc', |
- 'browser/sync/test/live_sync/performance/sessions_sync_perf_test.cc', |
- 'browser/sync/test/live_sync/performance/typed_urls_sync_perf_test.cc', |
- 'browser/sync/test/live_sync/sessions_helper.cc', |
- 'browser/sync/test/live_sync/sessions_helper.h', |
- 'browser/sync/test/live_sync/sync_datatype_helper.cc', |
- 'browser/sync/test/live_sync/sync_datatype_helper.h', |
- 'browser/sync/test/live_sync/sync_extension_helper.cc', |
- 'browser/sync/test/live_sync/sync_extension_helper.h', |
- 'browser/sync/test/live_sync/typed_urls_helper.cc', |
- 'browser/sync/test/live_sync/typed_urls_helper.h', |
+ 'browser/sync/test/integration/autofill_helper.cc', |
+ 'browser/sync/test/integration/autofill_helper.h', |
+ 'browser/sync/test/integration/bookmarks_helper.cc', |
+ 'browser/sync/test/integration/bookmarks_helper.h', |
+ 'browser/sync/test/integration/extensions_helper.cc', |
+ 'browser/sync/test/integration/extensions_helper.h', |
+ 'browser/sync/test/integration/passwords_helper.cc', |
+ 'browser/sync/test/integration/passwords_helper.h', |
+ 'browser/sync/test/integration/performance/autofill_sync_perf_test.cc', |
+ 'browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc', |
+ 'browser/sync/test/integration/performance/extensions_sync_perf_test.cc', |
+ 'browser/sync/test/integration/performance/sync_timing_helper.cc', |
+ 'browser/sync/test/integration/performance/sync_timing_helper.h', |
+ 'browser/sync/test/integration/performance/passwords_sync_perf_test.cc', |
+ 'browser/sync/test/integration/performance/sessions_sync_perf_test.cc', |
+ 'browser/sync/test/integration/performance/typed_urls_sync_perf_test.cc', |
+ 'browser/sync/test/integration/sessions_helper.cc', |
+ 'browser/sync/test/integration/sessions_helper.h', |
+ 'browser/sync/test/integration/sync_datatype_helper.cc', |
+ 'browser/sync/test/integration/sync_datatype_helper.h', |
+ 'browser/sync/test/integration/sync_extension_helper.cc', |
+ 'browser/sync/test/integration/sync_extension_helper.h', |
+ 'browser/sync/test/integration/sync_test.cc', |
+ 'browser/sync/test/integration/sync_test.h', |
+ 'browser/sync/test/integration/typed_urls_helper.cc', |
+ 'browser/sync/test/integration/typed_urls_helper.h', |
'test/base/out_of_proc_test_runner.cc', |
'test/base/test_notification_tracker.cc', |
'test/base/test_notification_tracker.h', |