[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 116 matching lines @@
             }],
           ],
         }],
       ],
     },
     {
       'target_name': 'interactive_ui_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
+        'chrome',

[Ryan Sleevi, 2012/12/07 03:16:31]

BUG: You shouldn't be re-introducing this dependency. It was removed in
http://crrev.com/171373 - which makes me concerned that it may be regressing
something.

[Raghu Simha, 2012/12/07 06:08:33]

I recall there being a merge conflict right about here. Pretty sure it was my
mistake. Removed.

         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'common/extensions/api/api.gyp:api',
         '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',
         '../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',
         '../webkit/support/webkit_support.gyp:webkit_resources',
@@ skipping 56 matching lines @@
         'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
         'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc',
         'browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h',
         'browser/ui/views/tabs/tab_drag_controller_interactive_uitest_win.cc',
         'test/base/chrome_test_launcher.cc',
         'test/base/interactive_test_utils.cc',
         'test/base/interactive_test_utils.h',
         'test/base/interactive_test_utils_aura.cc',
         'test/base/interactive_test_utils_aura.h',
         'test/base/interactive_test_utils_gtk.cc',
-        'test/base/interactive_test_utils_mac.mm',        
+        'test/base/interactive_test_utils_mac.mm',
         'test/base/interactive_test_utils_views.cc',
         'test/base/interactive_test_utils_win.cc',
         'test/base/view_event_test_base.cc',
         'test/base/view_event_test_base.h',
         'test/ppapi/ppapi_interactive_browsertest.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
@@ skipping 187 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:sync_api',
+        '../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',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/webdriver/commands/alert_commands.cc',
@@ skipping 344 matching lines @@
         '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',
         '../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',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/webkit.gyp:test_shell_test_support',
@@ skipping 1141 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',
         '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',
         '../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': [
         '..',
@@ skipping 134 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',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
@@ skipping 262 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:sync_api',
+            '../sync/sync.gyp:sync',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'tools/profiles/generate_profile.cc',
             'tools/profiles/thumbnail-inl.h',
           ],
           'conditions': [
             ['OS=="win"', {
@@ skipping 42 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:sync_api',
+            '../sync/sync.gyp:sync',
             '../testing/gtest.gyp:gtest',
           ],
           'export_dependent_settings': [
             'test_support_common',
           ],
           'include_dirs': [
             '..',
           ],
           'cflags': [
              '-Wno-uninitialized',
@@ skipping 211 matching lines @@
                 # Note build/win/chrome_win.croc uniquely has the
                 # courgette source directory in an include path.
                 '../courgette/courgette.gyp:courgette_unittests',
                 'browser_tests',
                 ]}],
             ['OS=="linux"', {
               'dependencies': [
                 # Win bot needs to be turned into an interactive bot.
                 'interactive_ui_tests',
                 # Disabled from running in coverage_posix.py.
-                # We need to build this during compile step, so enabling here. 
+                # We need to build this during compile step, so enabling here.
                 'browser_tests',
                 '../courgette/courgette.gyp:courgette_unittests',
                 '../crypto/crypto.gyp:crypto_unittests',
                 'chromedriver_unittests',
                 '../build/temp_gyp/googleurl.gyp:googleurl_unittests',
                 'gpu_tests',
                 '../jingle/jingle.gyp:jingle_unittests',
                 '../net/net.gyp:net_perftests',
                 'performance_ui_tests',
                 'reliability_tests',
@@ skipping 148 matching lines @@
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }