Move sync test code out of chrome/test

chrome/chrome_tests.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 290 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'sync',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
       ],
     },
     {
       'target_name': 'test_support_syncapi',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         'syncapi_core',
         'test_support_sync',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         'syncapi_core',
         'test_support_sync',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
       ],
     },
     {
       'target_name': 'test_support_syncapi_service',
       'type': 'static_library',
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         'syncapi_service',
       ],
       'export_dependent_settings': [
@@ skipping 1342 matching lines @@
         'browser/sync/profile_sync_service_typed_url_unittest.cc',
         'browser/sync/profile_sync_service_unittest.cc',
         'browser/sync/profile_sync_test_util.cc',
         'browser/sync/profile_sync_test_util.h',
         'browser/sync/signin_manager_unittest.cc',
         'browser/sync/sync_setup_wizard_unittest.cc',
         'browser/sync/sync_ui_util_mac_unittest.mm',
         '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',
         'browser/tab_contents/thumbnail_generator_unittest.cc',
         'browser/tab_contents/web_contents_unittest.cc',
         'browser/tabs/pinned_tab_codec_unittest.cc',
         'browser/tabs/pinned_tab_service_unittest.cc',
         'browser/tabs/pinned_tab_test_utils.cc',
         'browser/tabs/tab_strip_model_unittest.cc',
         'browser/tabs/tab_strip_selection_model_unittest.cc',
@@ skipping 287 matching lines @@
         'test/base/browser_with_test_window_test.h',
         'test/base/menu_model_test.cc',
         'test/base/menu_model_test.h',
         'test/base/render_view_test.cc',
         'test/base/render_view_test.h',
         'test/base/test_notification_tracker.cc',
         'test/base/test_notification_tracker.h',
         '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',
         '../content/browser/download/save_package_unittest.cc',
         '../content/browser/in_process_webkit/dom_storage_unittest.cc',
         '../content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc',
         '../content/browser/in_process_webkit/webkit_context_unittest.cc',
         '../content/browser/in_process_webkit/webkit_thread_unittest.cc',
         '../content/browser/renderer_host/render_view_host_unittest.cc',
         '../content/browser/renderer_host/render_widget_host_unittest.cc',
@@ skipping 1099 matching lines @@
         'browser/sync/sessions/sync_session_unittest.cc',
         'browser/sync/sessions/test_util.cc',
         'browser/sync/sessions/test_util.h',
         'browser/sync/sync_js_controller_unittest.cc',
         'browser/sync/syncable/directory_backing_store_unittest.cc',
         'browser/sync/syncable/model_type_payload_map_unittest.cc',
         'browser/sync/syncable/model_type_unittest.cc',
         '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': [
         '..',
         '<(protoc_out_dir)',
       ],
       'defines' : [
         'SYNC_ENGINE_VERSION_STRING="Unknown"',
         '_CRT_SECURE_NO_WARNINGS',
         '_USE_32BIT_TIME_T',
       ],
@@ skipping 112 matching lines @@
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
         '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/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', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:ssl',
            ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
@@ skipping 72 matching lines @@
       ],
       'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         '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', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:ssl',
            ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
@@ skipping 659 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }