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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7828055: Move sync test code out of chrome/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/browser/sync/test_profile_sync_service.cc ('k') | chrome/test/live_sync/PRESUBMIT.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 99413)
+++ chrome/chrome_tests.gypi (working copy)
@@ -308,10 +308,10 @@
'sources': [
'browser/sync/js/js_test_util.cc',
'browser/sync/js/js_test_util.h',
- 'test/sync/null_directory_change_delegate.cc',
- 'test/sync/null_directory_change_delegate.h',
- 'test/sync/engine/test_directory_setter_upper.cc',
- 'test/sync/engine/test_directory_setter_upper.h',
+ 'browser/sync/test/null_directory_change_delegate.cc',
+ 'browser/sync/test/null_directory_change_delegate.h',
+ 'browser/sync/test/engine/test_directory_setter_upper.cc',
+ 'browser/sync/test/engine/test_directory_setter_upper.h',
],
},
{
@@ -331,8 +331,8 @@
'..',
],
'sources': [
- 'test/sync/engine/test_user_share.cc',
- 'test/sync/engine/test_user_share.h',
+ 'browser/sync/test/engine/test_user_share.cc',
+ 'browser/sync/test/engine/test_user_share.h',
],
},
{
@@ -1695,6 +1695,8 @@
'browser/sync/sync_ui_util_unittest.cc',
'browser/sync/test_profile_sync_service.cc',
'browser/sync/test_profile_sync_service.h',
+ 'browser/sync/test/test_http_bridge_factory.cc',
+ 'browser/sync/test/test_http_bridge_factory.h',
'browser/sync/util/cryptographer_unittest.cc',
'browser/sync/util/nigori_unittest.cc',
'browser/tab_contents/render_view_context_menu_unittest.cc',
@@ -2002,8 +2004,6 @@
'test/base/v8_unit_test.cc',
'test/base/v8_unit_test.h',
'test/data/resource.rc',
- 'test/sync/test_http_bridge_factory.cc',
- 'test/sync/test_http_bridge_factory.h',
'tools/convert_dict/convert_dict_unittest.cc',
'../content/browser/debugger/devtools_manager_unittest.cc',
'../content/browser/download/download_file_unittest.cc',
@@ -3123,21 +3123,21 @@
'browser/sync/syncable/syncable_enum_conversions_unittest.cc',
'browser/sync/syncable/syncable_id_unittest.cc',
'browser/sync/syncable/syncable_unittest.cc',
+ 'browser/sync/test/engine/mock_connection_manager.cc',
+ 'browser/sync/test/engine/mock_connection_manager.h',
+ 'browser/sync/test/engine/mock_gaia_authenticator.cc',
+ 'browser/sync/test/engine/mock_gaia_authenticator.h',
+ 'browser/sync/test/engine/mock_gaia_authenticator_unittest.cc',
+ 'browser/sync/test/engine/syncer_command_test.h',
+ 'browser/sync/test/engine/test_id_factory.h',
+ 'browser/sync/test/engine/test_syncable_utils.cc',
+ 'browser/sync/test/engine/test_syncable_utils.h',
+ 'browser/sync/test/sessions/test_scoped_session_event_listener.h',
'browser/sync/util/data_encryption_unittest.cc',
'browser/sync/util/extensions_activity_monitor_unittest.cc',
'browser/sync/util/protobuf_unittest.cc',
'browser/sync/util/user_settings_unittest.cc',
'browser/sync/weak_handle_unittest.cc',
- 'test/sync/engine/mock_connection_manager.cc',
- 'test/sync/engine/mock_connection_manager.h',
- 'test/sync/engine/mock_gaia_authenticator.cc',
- 'test/sync/engine/mock_gaia_authenticator.h',
- 'test/sync/engine/mock_gaia_authenticator_unittest.cc',
- 'test/sync/engine/syncer_command_test.h',
- 'test/sync/engine/test_id_factory.h',
- 'test/sync/engine/test_syncable_utils.cc',
- 'test/sync/engine/test_syncable_utils.h',
- 'test/sync/sessions/test_scoped_session_event_listener.h',
],
'include_dirs': [
'..',
@@ -3270,57 +3270,57 @@
'test/base/test_notification_tracker.cc',
'test/base/test_notification_tracker.h',
'test/data/resource.rc',
- 'test/live_sync/apps_helper.cc',
- 'test/live_sync/apps_helper.h',
- 'test/live_sync/autofill_helper.cc',
- 'test/live_sync/autofill_helper.h',
- 'test/live_sync/bookmarks_helper.cc',
- 'test/live_sync/bookmarks_helper.h',
- 'test/live_sync/extensions_helper.cc',
- 'test/live_sync/extensions_helper.h',
- 'test/live_sync/live_sync_test.cc',
- 'test/live_sync/live_sync_test.h',
- 'test/live_sync/many_client_bookmarks_sync_test.cc',
- 'test/live_sync/many_client_passwords_sync_test.cc',
- 'test/live_sync/many_client_preferences_sync_test.cc',
- 'test/live_sync/migration_errors_test.cc',
- 'test/live_sync/multiple_client_bookmarks_sync_test.cc',
- 'test/live_sync/multiple_client_passwords_sync_test.cc',
- 'test/live_sync/multiple_client_preferences_sync_test.cc',
- 'test/live_sync/multiple_client_sessions_sync_test.cc',
- 'test/live_sync/multiple_client_typed_urls_sync_test.cc',
- 'test/live_sync/passwords_helper.cc',
- 'test/live_sync/passwords_helper.h',
- 'test/live_sync/preferences_helper.cc',
- 'test/live_sync/preferences_helper.h',
- 'test/live_sync/sessions_helper.cc',
- 'test/live_sync/sessions_helper.h',
- 'test/live_sync/single_client_apps_sync_test.cc',
- 'test/live_sync/single_client_bookmarks_sync_test.cc',
- 'test/live_sync/single_client_extensions_sync_test.cc',
- 'test/live_sync/single_client_passwords_sync_test.cc',
- 'test/live_sync/single_client_preferences_sync_test.cc',
- 'test/live_sync/single_client_sessions_sync_test.cc',
- 'test/live_sync/single_client_themes_sync_test.cc',
- 'test/live_sync/single_client_typed_urls_sync_test.cc',
- 'test/live_sync/sync_datatype_helper.cc',
- 'test/live_sync/sync_datatype_helper.h',
- 'test/live_sync/sync_errors_test.cc',
- 'test/live_sync/sync_extension_helper.cc',
- 'test/live_sync/sync_extension_helper.h',
- 'test/live_sync/themes_helper.cc',
- 'test/live_sync/themes_helper.h',
- 'test/live_sync/two_client_apps_sync_test.cc',
- 'test/live_sync/two_client_autofill_sync_test.cc',
- 'test/live_sync/two_client_bookmarks_sync_test.cc',
- 'test/live_sync/two_client_extensions_sync_test.cc',
- 'test/live_sync/two_client_passwords_sync_test.cc',
- 'test/live_sync/two_client_preferences_sync_test.cc',
- 'test/live_sync/two_client_sessions_sync_test.cc',
- 'test/live_sync/two_client_themes_sync_test.cc',
- 'test/live_sync/two_client_typed_urls_sync_test.cc',
- 'test/live_sync/typed_urls_helper.cc',
- 'test/live_sync/typed_urls_helper.h',
+ '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',
],
'conditions': [
['toolkit_uses_gtk == 1', {
@@ -3413,36 +3413,36 @@
'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',
'test/base/out_of_proc_test_runner.cc',
'test/base/test_notification_tracker.cc',
'test/base/test_notification_tracker.h',
'test/data/resource.rc',
- 'test/live_sync/autofill_helper.cc',
- 'test/live_sync/autofill_helper.h',
- 'test/live_sync/bookmarks_helper.cc',
- 'test/live_sync/bookmarks_helper.h',
- 'test/live_sync/extensions_helper.cc',
- 'test/live_sync/extensions_helper.h',
- 'test/live_sync/live_sync_test.cc',
- 'test/live_sync/live_sync_test.h',
- 'test/live_sync/passwords_helper.cc',
- 'test/live_sync/passwords_helper.h',
- 'test/live_sync/performance/autofill_sync_perf_test.cc',
- 'test/live_sync/performance/bookmarks_sync_perf_test.cc',
- 'test/live_sync/performance/extensions_sync_perf_test.cc',
- 'test/live_sync/performance/sync_timing_helper.cc',
- 'test/live_sync/performance/sync_timing_helper.h',
- 'test/live_sync/performance/passwords_sync_perf_test.cc',
- 'test/live_sync/performance/sessions_sync_perf_test.cc',
- 'test/live_sync/performance/typed_urls_sync_perf_test.cc',
- 'test/live_sync/sessions_helper.cc',
- 'test/live_sync/sessions_helper.h',
- 'test/live_sync/sync_datatype_helper.cc',
- 'test/live_sync/sync_datatype_helper.h',
- 'test/live_sync/sync_extension_helper.cc',
- 'test/live_sync/sync_extension_helper.h',
- 'test/live_sync/typed_urls_helper.cc',
- 'test/live_sync/typed_urls_helper.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {
« no previous file with comments | « chrome/browser/sync/test_profile_sync_service.cc ('k') | chrome/test/live_sync/PRESUBMIT.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698