[Sync] Move chrome/browser/sync/api files into their own targets

New target is 'syncapi_service'.

Rename existing 'syncapi' target to 'syncapi_core'.

BUG=
TEST=


Review URL: http://codereview.chromium.org/7020031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87666 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome.gyp

@@ -26,7 +26,7 @@
       'debugger',
       'profile_import',
       'renderer',
-      'syncapi',
+      'syncapi_core',
       'utility',
       'service',
       '../content/content.gyp:content_gpu',
@@ -514,7 +514,7 @@
     {
       # Provides a syncapi dynamic library target from checked-in binaries,
       # or from compiling a stub implementation.
-      'target_name': 'syncapi',
+      'target_name': 'syncapi_core',
       'type': 'static_library',
       'sources': [
         'browser/sync/engine/http_post_provider_factory.h',
@@ -551,6 +551,38 @@
       # generated proto header files from sync_proto_cpp.
       'hard_dependency': 1,
     },
+    {
+      # Provides the API that Chrome services use to talk to sync.
+      'target_name': 'syncapi_service',
+      'type': 'static_library',
+      'sources': [
+        'browser/sync/api/syncable_service.cc',
+        'browser/sync/api/syncable_service.h',
+        'browser/sync/api/sync_data.h',
+        'browser/sync/api/sync_data.cc',
+        'browser/sync/api/sync_change.h',
+        'browser/sync/api/sync_change.cc',
+        'browser/sync/api/sync_change_processor.h',
+        'browser/sync/api/sync_change_processor.cc',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+        'sync',
+      ],
+      'export_dependent_settings': [
+        '../base/base.gyp:base',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
+        'sync',
+      ],
+      # Even though this target depends on sync_proto_cpp, it doesn't
+      # need to export a hard dependency since we explicitly avoid
+      # including the generated proto header files from this target's
+      # header files.
+    },
     {
       'target_name': 'sync',
       'type': 'static_library',

chrome/chrome_browser.gypi

@@ -23,7 +23,9 @@
         'profile_import',
         'safe_browsing_csd_proto',
         'safe_browsing_report_proto',
-        'syncapi',
+        # TODO(sync): Make browser not depend on syncapi_core directly.
+        'syncapi_core',
+        'syncapi_service',
         'theme_resources',
         'theme_resources_large',
         'theme_resources_standard',
@@ -2027,14 +2029,6 @@
         'browser/sync/profile_sync_service_harness.cc',
         'browser/sync/profile_sync_service_harness.h',
         'browser/sync/profile_sync_service_observer.h',
-        'browser/sync/api/syncable_service.cc',  # TODO(zea): make own target.
-        'browser/sync/api/syncable_service.h',
-        'browser/sync/api/sync_data.h',
-        'browser/sync/api/sync_data.cc',
-        'browser/sync/api/sync_change.h',
-        'browser/sync/api/sync_change.cc',
-        'browser/sync/api/sync_change_processor.h',
-        'browser/sync/api/sync_change_processor.cc',
         'browser/sync/signin_manager.cc',
         'browser/sync/signin_manager.h',
         'browser/sync/sync_setup_flow.cc',

chrome/chrome_tests.gypi

@@ -304,12 +304,12 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        'syncapi',
+        'syncapi_core',
         'test_support_sync',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
-        'syncapi',
+        'syncapi_core',
         'test_support_sync',
       ],
       'include_dirs': [
@@ -320,6 +320,25 @@
         'test/sync/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',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'browser/sync/api/syncable_service_mock.cc',
+        'browser/sync/api/syncable_service_mock.h',
+      ],
+    },
     {
       'target_name': 'test_support_sync_notifier',
       'type': 'static_library',
@@ -428,7 +447,7 @@
         'chrome_resources',
         'chrome_strings',
         'debugger',
-        'syncapi',
+        'syncapi_core',
         'test_support_common',
         'test_support_ui',
         '../third_party/hunspell/hunspell.gyp:hunspell',
@@ -783,7 +802,7 @@
         'chrome_resources',
         'chrome_strings',
         'common',
-        'syncapi',
+        'syncapi_core',
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
@@ -1614,8 +1633,6 @@
         'browser/sync/sync_setup_wizard_unittest.cc',
         'browser/sync/sync_ui_util_mac_unittest.mm',
         'browser/sync/sync_ui_util_unittest.cc',
-        'browser/sync/api/syncable_service_mock.cc',
-        'browser/sync/api/syncable_service_mock.h',
         'browser/sync/test_profile_sync_service.cc',
         'browser/sync/test_profile_sync_service.h',
         'browser/sync/util/cryptographer_unittest.cc',
@@ -3182,11 +3199,12 @@
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'profile_import',
-        'syncapi',
+        'syncapi_core',
         'sync_notifier',
         'test_support_common',
         'test_support_sync',
         'test_support_syncapi',
+        'test_support_syncapi_service',
         'test_support_sync_notifier',
         'test_support_unit',
       ],
@@ -3658,7 +3676,7 @@
             'test_support_common',
             'browser',
             'renderer',
-            'syncapi',
+            'syncapi_core',
             '../base/base.gyp:base',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
@@ -3777,7 +3795,7 @@
           'dependencies': [
             'chrome',
             'debugger',
-            'syncapi',
+            'syncapi_core',
             'test_support_common',
             'chrome_resources',
             'chrome_strings',

chrome_frame/chrome_frame.gyp

@@ -386,7 +386,7 @@
         '../chrome/chrome.gyp:chrome_resources',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
-        '../chrome/chrome.gyp:syncapi',
+        '../chrome/chrome.gyp:syncapi_core',
         '../content/content.gyp:content_gpu',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
@@ -786,7 +786,7 @@
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
             # Make the archive build happy.
-            '../chrome/chrome.gyp:syncapi',
+            '../chrome/chrome.gyp:syncapi_core',
             # Installer
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
@@ -917,7 +917,7 @@
             '../breakpad/breakpad.gyp:breakpad_handler_dll',
             '../chrome/chrome.gyp:automation',
             # Make the archive build happy.
-            '../chrome/chrome.gyp:syncapi',
+            '../chrome/chrome.gyp:syncapi_core',
             # Installer
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',