[Sync] Move 'syncapi_core' and 'sync_unit_tests' targets to sync/

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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',
       'common/pref_names.cc',
@@ skipping 336 matching lines @@
           ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
     {
-      'target_name': 'test_support_syncapi',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        'syncapi_core',
-        '../sync/sync.gyp:test_support_sync',
-      ],
-      'export_dependent_settings': [
-        '../base/base.gyp:base',
-        'syncapi_core',
-        '../sync/sync.gyp:test_support_sync',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        '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': [
         '../testing/gmock.gyp:gmock',
         'syncapi_service',
       ],
@@ skipping 86 matching lines @@
             }],
           ],
         }],
       ],
     },
     {
       'target_name': 'interactive_ui_tests',
       'type': 'executable',
       'dependencies': [
         '../sync/protocol/sync_proto.gyp:sync_proto',
+        '../sync/sync.gyp:syncapi_core',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'debugger',
-        'syncapi_core',
         'test_support_common',
         'test_support_ui',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
@@ skipping 348 matching lines @@
       # See http://www.chromium.org/developers/testing/webdriver-for-chrome
       'target_name': 'chromedriver_lib',
       'type': 'static_library',
       'dependencies': [
         'browser',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chromedriver_support',
         'common',
-        'syncapi_core',
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:syncapi_core',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/webdriver/commands/alert_commands.cc',
@@ skipping 219 matching lines @@
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'test_support_common',
         '../sync/sync.gyp:test_support_sync',
         '../sync/sync.gyp:test_support_sync_notifier',
-        'test_support_syncapi',
+        '../sync/sync.gyp:test_support_syncapi_core',
         'test_support_syncapi_service',
         'test_support_unit',
         # 3) anything tests directly depend on
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/libjingle/libjingle.gyp:libjingle',
@@ skipping 525 matching lines @@
         'browser/signin/token_service_unittest.h',
         'browser/signin/ubertoken_fetcher_unittest.cc',
         'browser/speech/extension_api/tts_extension_api_controller_unittest.cc',
         'browser/speech/speech_recognition_bubble_controller_unittest.cc',
         'browser/spellchecker/spellcheck_platform_mac_unittest.cc',
         'browser/spellchecker/spellcheck_profile_unittest.cc',
         'browser/status_icons/status_icon_unittest.cc',
         'browser/status_icons/status_tray_unittest.cc',
         'browser/sync/abstract_profile_sync_service_test.cc',
         'browser/sync/abstract_profile_sync_service_test.h',
+        'browser/sync/api/sync_change_unittest.cc',
+        'browser/sync/api/sync_error_unittest.cc',
         'browser/sync/backend_migrator_unittest.cc',
         'browser/sync/glue/app_notification_data_type_controller_unittest.cc',
         'browser/sync/glue/autofill_data_type_controller_unittest.cc',
         'browser/sync/glue/bookmark_data_type_controller_unittest.cc',
         'browser/sync/glue/bridged_sync_notifier_unittest.cc',
         'browser/sync/glue/browser_thread_model_worker_unittest.cc',
         'browser/sync/glue/change_processor_mock.cc',
         'browser/sync/glue/change_processor_mock.h',
         'browser/sync/glue/chrome_encryptor_unittest.cc',
         'browser/sync/glue/chrome_extensions_activity_monitor_unittest.cc',
@@ skipping 2145 matching lines @@
           ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../ui/views/views.gyp:views',
           ],
         }],
       ],
     },
     {
-      'target_name': 'sync_unit_tests',
-      'type': 'executable',
-      'sources': [
-        'browser/sync/api/sync_change_unittest.cc',
-        'browser/sync/api/sync_error_unittest.cc',
-        'browser/sync/internal_api/change_record_unittest.cc',
-        'browser/sync/internal_api/debug_info_event_listener_unittest.cc',
-        'browser/sync/internal_api/syncapi_server_connection_manager_unittest.cc',
-        'browser/sync/internal_api/syncapi_unittest.cc',
-        'browser/sync/internal_api/js_mutation_event_observer_unittest.cc',
-        'browser/sync/internal_api/js_sync_manager_observer_unittest.cc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'dependencies': [
-        '../base/base.gyp:run_all_unittests',
-        '../base/base.gyp:test_support_base',
-        '../net/net.gyp:net',
-        '../net/net.gyp:net_test_support',
-        '../sync/sync.gyp:sync_notifier_tests',
-        '../sync/sync.gyp:sync_tests',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        'syncapi_core',
-        'test_support_syncapi',
-        'test_support_syncapi_service',
-      ],
-
-      # TODO(akalin): This is needed because histogram.cc uses
-      # leak_annotations.h, which pulls this in.  Make 'base'
-      # propagate this dependency.
-      'conditions': [
-        ['OS=="linux" and linux_use_tcmalloc==1', {
-          'dependencies': [
-            '../base/allocator/allocator.gyp:allocator',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'sync_integration_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'common',
         'renderer',
@@ skipping 480 matching lines @@
     },],  # OS!="mac"
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'generate_profile',
           'type': 'executable',
           'dependencies': [
             'test_support_common',
             'browser',
             'renderer',
-            'syncapi_core',
             '../base/base.gyp:base',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:syncapi_core',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'tools/profiles/generate_profile.cc',
             'tools/profiles/thumbnail-inl.h',
           ],
           'conditions': [
             ['OS=="win"', {
@@ skipping 41 matching lines @@
           # Documentation: http://dev.chromium.org/developers/testing/pyauto
           'target_name': 'pyautolib',
           'type': 'loadable_module',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
             'chrome_resources.gyp:chrome_resources',
             'chrome_resources.gyp:chrome_strings',
             'chrome_resources.gyp:theme_resources',
             'debugger',
-            'syncapi_core',
             'test_support_common',
             '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:syncapi_core',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [
             'test_support_common',
           ],
           'include_dirs': [
             '..',
           ],
           'cflags': [
              '-Wno-uninitialized',
@@ skipping 271 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'
 }