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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 49e7b6662577b43a5890c8bf90ab1af5b66601fd..650b6230926dae464a0bbc095cc1618e1dcc72e5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -39,7 +39,6 @@
       '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',
@@ -380,6 +379,9 @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
+      'export_dependent_settings': [
+        '../sync/sync.gyp:sync',
+      ],
       'include_dirs': [
         '..',
       ],
@@ -457,8 +459,7 @@
       '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',
@@ -713,12 +714,15 @@
         '../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': [
         '..',
       ],
@@ -954,10 +958,10 @@
         '../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',
@@ -2607,7 +2611,6 @@
       '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',
@@ -2621,7 +2624,7 @@
         '../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',
@@ -3410,7 +3413,6 @@
       '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',
@@ -3858,7 +3860,6 @@
       'type': 'executable',
       'dependencies': [
         'browser',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         'chrome',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
@@ -4021,7 +4022,6 @@
       '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',
@@ -4307,7 +4307,6 @@
             '../base/base.gyp:base',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
-            '../sync/sync.gyp:syncapi_core',
           ],
           'include_dirs': [
             '..',
@@ -4371,7 +4370,6 @@
             'debugger',
             'test_support_common',
             '../skia/skia.gyp:skia',
-            '../sync/sync.gyp:syncapi_core',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [