[sync] Componentize sync: Part Final: Target 'sync' is now its own component

chrome/chrome_tests.gypi

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 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',
       'common/pref_names.h',
@@ skipping 131 matching lines @@
         'debugger',
         'renderer',
         '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',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         '../sync/sync.gyp:sync_api',
+        '../sync/sync.gyp:sync_proto',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libpng/libpng.gyp:libpng',
         '../third_party/zlib/zlib.gyp:zlib',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/npapi/npapi.gyp:npapi',
         # Runtime dependencies
         '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
@@ skipping 673 matching lines @@
         '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',
         '../device/device.gyp:device_bluetooth_mocks',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         '../sync/sync.gyp:sync_notifier',
+        '../sync/sync.gyp:sync_proto',
         '../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',
         '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
         '../v8/tools/gyp/v8.gyp:v8',
@@ skipping 769 matching lines @@
       ],  # conditions
     },  # target browser_tests
     {
       # 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',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync_proto',
         '../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',
         # Runtime dependencies
         '../third_party/mesa/mesa.gyp:osmesa',
       ],
@@ skipping 269 matching lines @@
             '../ui/views/views.gyp:views',
           ],
         }],
       ],
     },
     {
       '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',
         'chrome_resources.gyp:packed_extra_resources',
         'chrome_resources.gyp:packed_resources',
         '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',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync_notifier',
+        '../sync/sync.gyp:sync_proto',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
-        'browser/sessions/session_backend.cc',
-        'browser/sync/glue/session_model_associator.cc',
         'test/base/chrome_test_launcher.cc',
         'test/data/resource.rc',
         'browser/sync/test/integration/apps_helper.cc',
         'browser/sync/test/integration/apps_helper.h',
         'browser/sync/test/integration/autofill_helper.cc',
         'browser/sync/test/integration/autofill_helper.h',
         'browser/sync/test/integration/bookmarks_helper.cc',
         'browser/sync/test/integration/bookmarks_helper.h',
         'browser/sync/test/integration/cross_platform_sync_test.cc',
         'browser/sync/test/integration/enable_disable_test.cc',
@@ skipping 110 matching lines @@
           'dependencies': [
             '../ui/views/views.gyp:views',
           ],
         }],
       ],
     },
     {
       'target_name': 'sync_performance_tests',
       'type': 'executable',
       'dependencies': [
-        '../sync/protocol/sync_proto.gyp:sync_proto',
         'browser',
         'chrome',
         'common/extensions/api/api.gyp:api',
         'test_support_common',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync_notifier',
+        '../sync/sync.gyp:sync_proto',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
       ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
-        'browser/sessions/session_backend.cc',
-        'browser/sync/glue/session_model_associator.cc',
         'browser/sync/test/integration/autofill_helper.cc',
         'browser/sync/test/integration/autofill_helper.h',
         'browser/sync/test/integration/bookmarks_helper.cc',
         'browser/sync/test/integration/bookmarks_helper.h',
         'browser/sync/test/integration/extensions_helper.cc',
         'browser/sync/test/integration/extensions_helper.h',
         'browser/sync/test/integration/passwords_helper.cc',
         'browser/sync/test/integration/passwords_helper.h',
         'browser/sync/test/integration/performance/autofill_sync_perf_test.cc',
         'browser/sync/test/integration/performance/bookmarks_sync_perf_test.cc',
@@ skipping 257 matching lines @@
     ],  # OS=="win"
     ['OS=="linux" or OS=="win"', {
       'targets': [
         {
           'target_name': 'generate_profile',
           'type': 'executable',
           'dependencies': [
             'test_support_common',
             'browser',
             'renderer',
-            'chrome_resources.gyp:packed_resources',
+            'chrome_resources.gyp:packed_resources',
             '../base/base.gyp:base',
             '../net/net.gyp:net_test_support',
             '../skia/skia.gyp:skia',
             '../sync/sync.gyp:sync_api',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'tools/profiles/generate_profile.cc',
@@ skipping 434 matching lines @@
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }