[sync] Componentize sync: Part 1: Clean up sync.gyp and update chrome / test dependencies

sync/sync.gyp

 # 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': {
     'chromium_code': 1,
   },
   'targets': [
     # The core sync library.
-    #
-    # TODO(akalin): Rename this to something like 'sync_core' and
-    # reserve the 'sync' name for the overarching library that clients
-    # should depend on.
     {
-      'target_name': 'sync',
-      # TODO(akalin): Change this to '<(component)'.  When we rename
-      # this to 'sync_core' and make the overarching 'sync' library,
-      # make that one '<(component)'.
+      'target_name': 'sync_core',
+      # TODO(rsimha): Change this to '<(component)' after properly exporting
+      # dependencies on the sync_proto target.
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'defines': [
         'SYNC_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../google_apis/google_apis.gyp:google_apis',
         '../net/net.gyp:net',
         '../sql/sql.gyp:sql',
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
       ],
       'sources': [
         'base/sync_export.h',
-        'internal_api/public/base/enum_set.h',
-        'internal_api/public/base/invalidation.cc',
-        'internal_api/public/base/invalidation.h',
-        'internal_api/public/base/model_type.h',
-        'internal_api/public/base/model_type_invalidation_map.cc',
-        'internal_api/public/base/model_type_invalidation_map.h',
-        'internal_api/public/base/node_ordinal.cc',
-        'internal_api/public/base/node_ordinal.h',
-        'internal_api/public/base/ordinal.h',
-        'internal_api/public/base/progress_marker_map.cc',
-        'internal_api/public/base/progress_marker_map.h',
-        'internal_api/public/engine/model_safe_worker.cc',
-        'internal_api/public/engine/model_safe_worker.h',
-        'internal_api/public/engine/passive_model_worker.cc',
-        'internal_api/public/engine/passive_model_worker.h',
-        'internal_api/public/engine/polling_constants.cc',
-        'internal_api/public/engine/polling_constants.h',
-        'internal_api/public/engine/sync_status.cc',
-        'internal_api/public/engine/sync_status.h',
-        'internal_api/public/sessions/model_neutral_state.cc',
-        'internal_api/public/sessions/model_neutral_state.h',
-        'internal_api/public/sessions/sync_session_snapshot.cc',
-        'internal_api/public/sessions/sync_session_snapshot.h',
-        'internal_api/public/sessions/sync_source_info.cc',
-        'internal_api/public/sessions/sync_source_info.h',
-        'internal_api/public/util/experiments.h',
-        'internal_api/public/util/immutable.h',
-        'internal_api/public/util/syncer_error.cc',
-        'internal_api/public/util/syncer_error.h',
-        'internal_api/public/util/sync_string_conversions.cc',
-        'internal_api/public/util/sync_string_conversions.h',
-        'internal_api/public/util/report_unrecoverable_error_function.h',
-        'internal_api/public/util/unrecoverable_error_handler.h',
-        'internal_api/public/util/unrecoverable_error_info.h',
-        'internal_api/public/util/unrecoverable_error_info.cc',
-        'internal_api/public/util/weak_handle.cc',
-        'internal_api/public/util/weak_handle.h',
         'engine/all_status.cc',
         'engine/all_status.h',
         'engine/apply_control_data_updates.cc',
         'engine/apply_control_data_updates.h',
         'engine/apply_updates_and_resolve_conflicts_command.cc',
         'engine/apply_updates_and_resolve_conflicts_command.h',
         'engine/backoff_delay_provider.cc',
         'engine/backoff_delay_provider.h',
         'engine/build_commit_command.cc',
         'engine/build_commit_command.h',
@@ skipping 156 matching lines @@
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:jingle_glue',
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         # TODO(akalin): Remove this (http://crbug.com/133352).
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
-        'sync',
+        'sync_core',
       ],
       'export_dependent_settings': [
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
       ],
       'sources': [
         'notifier/invalidation_handler.h',
         'notifier/invalidation_util.cc',
         'notifier/invalidation_util.h',
         'notifier/invalidator_factory.cc',
@@ skipping 29 matching lines @@
         }],
         ['OS != "ios"', {
           'dependencies': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
           ],
         }],
       ],
     },
     # The sync internal API library.
     {
-      'target_name': 'syncapi_core',
+      'target_name': 'sync_internal_api',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         'protocol/sync_proto.gyp:sync_proto',
         'sync_notifier',
-        'sync',
+        'sync_core',
       ],
       'export_dependent_settings': [
         # Propagate sync_proto since our headers include its generated
         # files.
         'protocol/sync_proto.gyp:sync_proto',
-        'sync',
+        'sync_core',
       ],
       'sources': [
-        'internal_api/public/base_node.h',
-        'internal_api/public/base_transaction.h',
-        'internal_api/public/change_record.h',
-        'internal_api/public/configure_reason.h',
-        'internal_api/public/http_bridge.h',
-        'internal_api/public/http_post_provider_factory.h',
-        'internal_api/public/http_post_provider_interface.h',
-        'internal_api/public/internal_components_factory.h',
-        'internal_api/public/internal_components_factory_impl.h',
-        'internal_api/public/read_node.h',
-        'internal_api/public/read_transaction.h',
-        'internal_api/public/sync_manager.h',
-        'internal_api/public/sync_encryption_handler.cc',
-        'internal_api/public/sync_encryption_handler.h',
-        'internal_api/public/sync_manager.cc',
-        'internal_api/public/sync_manager_factory.h',
-        'internal_api/public/user_share.h',
-        'internal_api/public/write_node.h',
-        'internal_api/public/write_transaction.h',
         'internal_api/base_node.cc',
         'internal_api/base_transaction.cc',
         'internal_api/change_record.cc',
         'internal_api/change_reorder_buffer.cc',
         'internal_api/change_reorder_buffer.h',
         'internal_api/debug_info_event_listener.cc',
         'internal_api/debug_info_event_listener.h',
         'internal_api/http_bridge.cc',
         'internal_api/internal_components_factory_impl.cc',
         'internal_api/js_mutation_event_observer.cc',
         'internal_api/js_mutation_event_observer.h',
         'internal_api/js_sync_encryption_handler_observer.cc',
         'internal_api/js_sync_encryption_handler_observer.h',
         'internal_api/js_sync_manager_observer.cc',
         'internal_api/js_sync_manager_observer.h',
+        'internal_api/public/base_node.h',
+        'internal_api/public/base_transaction.h',
+        'internal_api/public/base/enum_set.h',
+        'internal_api/public/base/invalidation.cc',
+        'internal_api/public/base/invalidation.h',
+        'internal_api/public/base/model_type_invalidation_map.cc',
+        'internal_api/public/base/model_type_invalidation_map.h',
+        'internal_api/public/base/model_type.h',
+        'internal_api/public/base/node_ordinal.cc',
+        'internal_api/public/base/node_ordinal.h',
+        'internal_api/public/base/ordinal.h',
+        'internal_api/public/base/progress_marker_map.cc',
+        'internal_api/public/base/progress_marker_map.h',
+        'internal_api/public/change_record.h',
+        'internal_api/public/configure_reason.h',
+        'internal_api/public/engine/model_safe_worker.cc',
+        'internal_api/public/engine/model_safe_worker.h',
+        'internal_api/public/engine/passive_model_worker.cc',
+        'internal_api/public/engine/passive_model_worker.h',
+        'internal_api/public/engine/polling_constants.cc',
+        'internal_api/public/engine/polling_constants.h',
+        'internal_api/public/engine/sync_status.cc',
+        'internal_api/public/engine/sync_status.h',
+        'internal_api/public/http_bridge.h',
+        'internal_api/public/http_post_provider_factory.h',
+        'internal_api/public/http_post_provider_interface.h',
+        'internal_api/public/internal_components_factory_impl.h',
+        'internal_api/public/internal_components_factory.h',
+        'internal_api/public/read_node.h',
+        'internal_api/public/read_transaction.h',
+        'internal_api/public/sessions/model_neutral_state.cc',
+        'internal_api/public/sessions/model_neutral_state.h',
+        'internal_api/public/sessions/sync_session_snapshot.cc',
+        'internal_api/public/sessions/sync_session_snapshot.h',
+        'internal_api/public/sessions/sync_source_info.cc',
+        'internal_api/public/sessions/sync_source_info.h',
+        'internal_api/public/sync_encryption_handler.cc',
+        'internal_api/public/sync_encryption_handler.h',
+        'internal_api/public/sync_manager_factory.h',
+        'internal_api/public/sync_manager.cc',
+        'internal_api/public/sync_manager.h',
+        'internal_api/public/user_share.h',
+        'internal_api/public/util/experiments.h',
+        'internal_api/public/util/immutable.h',
+        'internal_api/public/util/report_unrecoverable_error_function.h',
+        'internal_api/public/util/sync_string_conversions.cc',
+        'internal_api/public/util/sync_string_conversions.h',
+        'internal_api/public/util/syncer_error.cc',
+        'internal_api/public/util/syncer_error.h',
+        'internal_api/public/util/unrecoverable_error_handler.h',
+        'internal_api/public/util/unrecoverable_error_info.cc',
+        'internal_api/public/util/unrecoverable_error_info.h',
+        'internal_api/public/util/weak_handle.cc',
+        'internal_api/public/util/weak_handle.h',
+        'internal_api/public/write_node.h',
+        'internal_api/public/write_transaction.h',
         'internal_api/read_node.cc',
         'internal_api/read_transaction.cc',
-        'internal_api/syncapi_internal.cc',
-        'internal_api/syncapi_internal.h',
-        'internal_api/syncapi_server_connection_manager.cc',
-        'internal_api/syncapi_server_connection_manager.h',
         'internal_api/sync_encryption_handler_impl.cc',
         'internal_api/sync_encryption_handler_impl.h',
         'internal_api/sync_manager_factory.cc',
         'internal_api/sync_manager_impl.cc',
         'internal_api/sync_manager_impl.h',
+        'internal_api/syncapi_internal.cc',
+        'internal_api/syncapi_internal.h',
+        'internal_api/syncapi_server_connection_manager.cc',
+        'internal_api/syncapi_server_connection_manager.h',
         'internal_api/user_share.cc',
         'internal_api/write_node.cc',
         'internal_api/write_transaction.cc',
       ],
     },
 
     # The sync external API library.
     {
-      'target_name': 'syncapi_service',
+      'target_name': 'sync_api',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         'protocol/sync_proto.gyp:sync_proto',
-        'sync',
+        'sync_core',
       ],
       # We avoid including header files from sync_proto in our public
       # header files so we don't need to export its settings.
       'sources': [
         'api/string_ordinal.h',
         'api/syncable_service.cc',
         'api/syncable_service.h',
         'api/sync_data.h',
         'api/sync_data.cc',
         'api/sync_change.h',
         'api/sync_change.cc',
         'api/sync_change_processor.h',
         'api/sync_change_processor.cc',
         'api/sync_error.h',
         'api/sync_error.cc',
         'api/sync_error_factory.h',
         'api/sync_error_factory.cc',
         'api/time.h',
       ],
     },
 
-    # Test support files for the 'sync' target.
+    # The componentized sync library.

[Ryan Sleevi, 2012/11/03 21:50:06]

??? This isn't a 'type': '<(component)' target, so I'm not sure what this
comment means

[Raghu Simha, 2012/11/05 23:04:22]

Sorry, this was from an earlier attempt to fully componentize sync in one go.
This patch doesn't do so, due to trickiness associated with exporting the
sync_proto target. It is my intent to change the type of this target to
'<(component)'. Until then, I've added a TODO below.

     {
-      'target_name': 'test_support_sync',
+      'target_name': 'sync_component',
+      'type': 'none',
+      'variables': { 'enable_wexit_time_destructors': 1, },
+      'dependencies': [
+        'sync_api',
+        'sync_core',
+        'sync_notifier',
+        'sync_internal_api',
+      ],
+      'export_dependent_settings': [
+        'sync_api',
+        'sync_core',
+        'sync_notifier',
+        'sync_internal_api',
+      ],
+    },
+
+    # The public sync target.  This depends on 'sync_component' and
+    # 'sync_proto' separately since 'sync_proto' isn't exportable from
+    # 'sync_component' (for now).
+    {

[Ryan Sleevi, 2012/11/03 21:50:06]

It's not clear to me what this target actually provides/does for callers. Did I
miss a target depending on this?

[Raghu Simha, 2012/11/05 23:04:22]

There are a couple of standalone sync tools and sync test targets that depend on
this. See 'sync_unit_tests', 'sync_listen_notifications' and 'sync_client'.

+      'target_name': 'sync',
+      'type': 'none',
+      'dependencies': [
+        'sync_component',
+        'protocol/sync_proto.gyp:sync_proto',
+      ],
+      'export_dependent_settings': [
+        'sync_component',
+        'protocol/sync_proto.gyp:sync_proto',
+      ],
+    },
+
+    # Test support files for the 'sync_core' target.
+    {
+      'target_name': 'test_support_sync_core',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
+        'sync_core',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
+        'sync_core',
       ],
       'sources': [
         'internal_api/public/base/invalidation_test_util.cc',
         'internal_api/public/base/invalidation_test_util.h',
         'internal_api/public/base/model_type_invalidation_map_test_util.cc',
         'internal_api/public/base/model_type_invalidation_map_test_util.h',
         'internal_api/public/base/model_type_test_util.cc',
         'internal_api/public/base/model_type_test_util.h',
         'js/js_test_util.cc',
         'js/js_test_util.h',
@@ skipping 36 matching lines @@
     # Test support files for the 'sync_notifier' target.
     {
       'target_name': 'test_support_sync_notifier',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        'sync_core',
         'sync_notifier',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
+        'sync_core',
         'sync_notifier',
       ],
       'sources': [
         'notifier/fake_invalidation_state_tracker.cc',
         'notifier/fake_invalidation_state_tracker.h',
         'notifier/fake_invalidator.cc',
         'notifier/fake_invalidator.h',
         'notifier/fake_invalidation_handler.cc',
         'notifier/fake_invalidation_handler.h',
         'notifier/invalidator_test_template.cc',
         'notifier/invalidator_test_template.h',
         'notifier/object_id_invalidation_map_test_util.cc',
         'notifier/object_id_invalidation_map_test_util.h',
       ],
     },
 
-    # Test support files for the 'syncapi_core' target.
+    # Test support files for the 'sync_internal_api' target.
     {
-      'target_name': 'test_support_syncapi_core',
+      'target_name': 'test_support_sync_internal_api',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'syncapi_core',
+        'sync_core',
         'sync_notifier',
-        'test_support_sync',
+        'test_support_sync_core',
       ],
       'export_dependent_settings': [
         '../testing/gtest.gyp:gtest',
-        'syncapi_core',
+        'sync_core',
         'sync_notifier',
-        'test_support_sync',
+        'test_support_sync_core',
       ],
       'sources': [
         'internal_api/public/test/fake_sync_manager.h',
         'internal_api/public/test/test_entry_factory.h',
         'internal_api/public/test/test_internal_components_factory.h',
         'internal_api/public/test/test_user_share.h',
         'internal_api/test/fake_sync_manager.cc',
         'internal_api/test/test_entry_factory.cc',
         'internal_api/test/test_internal_components_factory.cc',
         'internal_api/test/test_user_share.cc',
       ],
     },
 
-    # Test support files for the 'syncapi_service' target.
+    # Test support files for the 'sync_api' target.
     {
-      'target_name': 'test_support_syncapi_service',
+      'target_name': 'test_support_sync_api',
       'type': 'static_library',
       'include_dirs': [
         '..',
       ],
       'dependencies': [
         '../testing/gmock.gyp:gmock',
-        'syncapi_service',
+        'sync_core',
       ],
       'export_dependent_settings': [
         '../testing/gmock.gyp:gmock',
-        'syncapi_service',
+        'sync_core',
       ],
       'sources': [
         'api/fake_syncable_service.cc',
         'api/fake_syncable_service.h',
         'api/sync_error_factory_mock.cc',
         'api/sync_error_factory_mock.h',
       ],
     },
 
-    # Unit tests for the 'sync' target.  This cannot be a static
+    # Unit tests for the 'sync_core' target.  This cannot be a static
     # library because the unit test files have to be compiled directly
     # into the executable, so we push the target files to the
     # depending executable target via direct_dependent_settings.
     {
-      'target_name': 'sync_tests',
+      'target_name': 'sync_core_tests',
       'type': 'none',
       # We only want unit test executables to include this target.
       'suppress_wildcard': 1,
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
-        'test_support_sync',
+        'sync_core',
+        'test_support_sync_core',
       ],
       # Propagate all dependencies since the actual compilation
       # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
-        'test_support_sync',
+        'sync_core',
+        'test_support_sync_core',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
         'sources': [
           'internal_api/public/base/enum_set_unittest.cc',
           'internal_api/public/base/model_type_invalidation_map_unittest.cc',
           'internal_api/public/base/node_ordinal_unittest.cc',
           'internal_api/public/base/ordinal_unittest.cc',
@@ skipping 58 matching lines @@
       'type': 'none',
       # We only want unit test executables to include this target.
       'suppress_wildcard': 1,
       'dependencies': [
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:notifier_test_util',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-        'sync',
-        'sync_notifier',
+        'sync_core',
         'test_support_sync_notifier',
       ],
       # Propagate all dependencies since the actual compilation
       # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../jingle/jingle.gyp:notifier_test_util',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
-        'sync',
-        'sync_notifier',
+        'sync_core',
         'test_support_sync_notifier',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
         'sources': [
           'notifier/invalidator_factory_unittest.cc',
         ],
         'conditions': [
@@ skipping 17 matching lines @@
           'dependencies': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
           ],
           'export_dependent_settings': [
             '../third_party/libjingle/libjingle.gyp:libjingle',
           ],
         }],
       ],
     },
 
-    # Unit tests for the 'syncapi_core' target.  This cannot be a static
+    # Unit tests for the 'sync_internal_api' target.  This cannot be a static
     # library because the unit test files have to be compiled directly
     # into the executable, so we push the target files to the
     # depending executable target via direct_dependent_settings.
     {
-      'target_name': 'syncapi_core_tests',
+      'target_name': 'sync_internal_api_tests',
       'type': 'none',
       # We only want unit test executables to include this target.
       'suppress_wildcard': 1,
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
-        'sync_notifier',
-        'syncapi_core',
-        'test_support_syncapi_core',
+        'sync_core',
+        'test_support_sync_internal_api',
       ],
       # Propagate all dependencies since the actual compilation
       # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
-        'sync_notifier',
-        'syncapi_core',
-        'test_support_syncapi_core',
+        'sync_core',
+        'test_support_sync_internal_api',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
         'sources': [
           'internal_api/public/change_record_unittest.cc',
           'internal_api/debug_info_event_listener_unittest.cc',
           'internal_api/http_bridge_unittest.cc',
           'internal_api/js_mutation_event_observer_unittest.cc',
           'internal_api/js_sync_encryption_handler_observer_unittest.cc',
           'internal_api/js_sync_manager_observer_unittest.cc',
           'internal_api/syncapi_server_connection_manager_unittest.cc',
           'internal_api/sync_encryption_handler_impl_unittest.cc',
           'internal_api/sync_manager_impl_unittest.cc',
         ],
       },
     },
 
-    # Unit tests for the 'syncapi_service' target.  This cannot be a static
+    # Unit tests for the 'sync_api' target.  This cannot be a static
     # library because the unit test files have to be compiled directly
     # into the executable, so we push the target files to the
     # depending executable target via direct_dependent_settings.
     {
-      'target_name': 'syncapi_service_tests',
+      'target_name': 'sync_api_tests',
       'type': 'none',
       # We only want unit test executables to include this target.
       'suppress_wildcard': 1,
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
-        'syncapi_service',
-        'test_support_syncapi_service',
+        'sync_core',
+        'test_support_sync_api',
       ],
       # Propagate all dependencies since the actual compilation
       # happens in the dependents.
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'protocol/sync_proto.gyp:sync_proto',
-        'sync',
-        'syncapi_service',
-        'test_support_syncapi_service',
+        'sync_core',
+        'test_support_sync_api',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
         'sources': [
           'api/sync_change_unittest.cc',
           'api/sync_error_unittest.cc',
         ],
       },
     },
 
     # The unit test executable for sync tests.
     {
       'target_name': 'sync_unit_tests',
       'type': '<(gtest_target_type)',
       # Typed-parametrized tests generate exit-time destructors.
       'variables': { 'enable_wexit_time_destructors': 0, },
       'dependencies': [
         '../base/base.gyp:run_all_unittests',
-        'sync_tests',
+        'sync',
+        'sync_api_tests',
+        'sync_core_tests',
         'sync_notifier_tests',
-        'syncapi_core_tests',
-        'syncapi_service_tests',
+        'sync_internal_api_tests',
       ],
       # 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',
           ],
         }],
@@ skipping 18 matching lines @@
         # A tool to listen to sync notifications and print them out.
         {
           'target_name': 'sync_listen_notifications',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
             '../net/net.gyp:net_test_support',
             'sync',
-            'sync_notifier',
           ],
           'sources': [
             'tools/sync_listen_notifications.cc',
           ],
         },
 
         # A standalone command-line sync client.
         {
           'target_name': 'sync_client',
           'type': 'executable',
-          'defines': [
-            'SYNC_TEST',
-          ],
           'dependencies': [
             '../base/base.gyp:base',
             '../jingle/jingle.gyp:notifier',
             '../net/net.gyp:net',
             '../net/net.gyp:net_test_support',
             'sync',
-            'sync_notifier',
-            'syncapi_core',
           ],
           'sources': [
             'tools/sync_client.cc',
           ],
         },
       ],
     }],
+
     # Special target to wrap a gtest_target_type==shared_library
     # sync_unit_tests into an android apk for execution.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
         {
           'target_name': 'sync_unit_tests_apk',
           'type': 'none',
           'dependencies': [
             'sync_unit_tests',
           ],
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }