[Sync] Make the 'sync' target the one clients should use

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 21 matching lines @@
   ],
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
       'dependencies': [
         'app/policy/cloud_policy_codegen.gyp:policy',
         'browser',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
         'common',
         'common/extensions/api/api.gyp:api',
         'plugin',
         'renderer',
         'utility',
         '../base/base.gyp:test_support_base',
         '../content/content.gyp:content_app',
@@ skipping 320 matching lines @@
         'chrome_resources.gyp:chrome_strings',
         'browser',
         'common',
         'test_support_common',
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
+      'export_dependent_settings': [
+        '../sync/sync.gyp:sync',
+      ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'browser/sync/profile_sync_service_mock.cc',
         'browser/sync/profile_sync_service_mock.h',
         'test/base/run_all_unittests.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ skipping 57 matching lines @@
               ],
             }],
           ],
         }],
       ],
     },
     {
       'target_name': 'interactive_ui_tests',
       'type': 'executable',
       'dependencies': [
-        '../sync/protocol/sync_proto.gyp:sync_proto',
-        '../sync/sync.gyp:syncapi_core',
+        '../sync/sync.gyp:sync',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'debugger',
         'test_support_common',
         # NOTE: don't add test_support_ui, no more UITests. See
         # http://crbug.com/137365
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../net/net.gyp:net',
         '../net/net.gyp:net_resources',
@@ skipping 234 matching lines @@
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chromedriver_support',
         'common',
         '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',
+        '../sync/sync.gyp:sync',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
       ],
+      'export_dependent_settings': [
+        '../sync/sync.gyp:sync',
+      ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/webdriver/commands/alert_commands.cc',
         'test/webdriver/commands/alert_commands.h',
         'test/webdriver/commands/appcache_status_command.cc',
         'test/webdriver/commands/appcache_status_command.h',
         'test/webdriver/commands/browser_connection_commands.cc',
         'test/webdriver/commands/browser_connection_commands.h',
@@ skipping 215 matching lines @@
         # 2) test-specific support libraries:
         '../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',
         '../ppapi/ppapi_internal.gyp:ppapi_unittest_shared',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'test_support_common',
-        '../sync/sync.gyp:test_support_sync',
+        '../sync/sync.gyp:test_support_sync_core',
         '../sync/sync.gyp:test_support_sync_notifier',
-        '../sync/sync.gyp:test_support_syncapi_core',
-        '../sync/sync.gyp:test_support_syncapi_service',
+        '../sync/sync.gyp:test_support_sync_internal_api',
+        '../sync/sync.gyp:test_support_sync_api',
         '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',
         '../third_party/libxml/libxml.gyp:libxml',
@@ skipping 1629 matching lines @@
       ],
     },
     {
       # Executable that runs each browser test in a new process.
       'target_name': 'browser_tests',
       'type': 'executable',
       'msvs_cygwin_shell': 0,
       'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
       'dependencies': [
         'browser',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:packed_extra_resources',
         'chrome_resources.gyp:packed_resources',
         'common/extensions/api/api.gyp:api',
         'renderer',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
-        '../sync/sync.gyp:test_support_syncapi_service',
+        '../sync/sync.gyp:test_support_sync_api',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/webkit.gyp:test_shell_test_support',
         # Runtime dependencies
         '../ppapi/ppapi_internal.gyp:ppapi_tests',
@@ skipping 768 matching lines @@
       ],
     },
     {
       # Executable that runs each perf browser test in a new process.
       'target_name': 'performance_browser_tests',
       'type': 'executable',
       'msvs_cygwin_shell': 0,
       'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
       'dependencies': [
         'browser',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:packed_extra_resources',
         'chrome_resources.gyp:packed_resources',
         'renderer',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../net/net.gyp:net',
@@ skipping 427 matching lines @@
             'test/perf/kraken_benchmark_uitest.js',
           ],
         },
       ],
     },
     {
       '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',
         'common/extensions/api/api.gyp:api',
         'renderer',
         'test_support_common',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
@@ skipping 142 matching lines @@
           'dependencies': [
             '../ui/views/views.gyp:views',
           ],
         }],
       ],
     },
     {
       'target_name': 'sync_performance_tests',
       'type': 'executable',
       'dependencies': [
-        '../sync/protocol/sync_proto.gyp:sync_proto',

[Ryan Sleevi, 2012/07/20 23:24:49]

This seems very counter-intuitive to me.

I admit, I haven't looked deeply into the tests, but the all of the dependencies
you're removing, it sounds like you're expecting them to be picked up
transitively via the export_dependent_settings?

Are/do you use any sync-specific types in these tests? I would imagine so,
that's why removing these doesn't seem to make sense.

I think what you have will work, but I tend to think of
export_dependent_settings as an extension of IWYU philosophy  - if you use it,
depend on it. If the sync portion ever /stops/ getting exported, your dependency
is still intact.

WDYT?

         'browser',
         'chrome',
         'common/extensions/api/api.gyp:api',
         'test_support_common',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
@@ skipping 265 matching lines @@
         {
           'target_name': 'generate_profile',
           'type': 'executable',
           'dependencies': [
             'test_support_common',
             'browser',
             'renderer',
             '../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 43 matching lines @@
           'type': 'loadable_module',
           'product_prefix': '_',
           'dependencies': [
             'chrome',
             'chrome_resources.gyp:chrome_resources',
             'chrome_resources.gyp:chrome_strings',
             'chrome_resources.gyp:theme_resources',
             'debugger',
             '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 307 matching lines @@
             'input_jars_paths': [
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
              ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],  # 'conditions'
 }