[sync] Componentize sync: Part 1: Clean up sync.gyp and update chrome / test dependencies

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 25 matching lines @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_browser',
         '../content/content.gyp:content_common',
         '../crypto/crypto.gyp:crypto',
         '../google_apis/google_apis.gyp:google_apis',
         '../media/media.gyp:media',
         '../net/net.gyp:net_with_v8',
         '../ppapi/ppapi_internal.gyp:ppapi_ipc',  # For PpapiMsg_LoadPlugin
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
-        '../sync/protocol/sync_proto.gyp:sync_proto',
-        # TODO(akalin): Depend only on syncapi_service from sync.
-        '../sync/sync.gyp:syncapi_core',
-        '../sync/sync.gyp:syncapi_service',
-        '../sync/sync.gyp:sync_notifier',
+        '../sync/sync.gyp:sync_api',
+        '../sync/sync.gyp:sync_internal_api',
         '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_proto_cpp',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/expat/expat.gyp:expat',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ skipping 23 matching lines @@
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'defines': [
         '<@(nacl_defines)',
       ],
       'direct_dependent_settings': {
         'defines': [
           '<@(nacl_defines)',
         ],
       },
-      'export_dependent_settings': [
-        '../sync/sync.gyp:sync_notifier',
-      ],
       'sources': [
         # All .cc, .h, .m, and .mm files under browser except for:
         # * tests and mocks.
         # * code below browser/chromeos
         # * code below browser/extensions
         'browser/about_flags.cc',
         'browser/about_flags.h',
         'browser/about_flags_android.cc',
         'browser/accessibility/accessibility_extension_api_constants.cc',
         'browser/accessibility/accessibility_extension_api_constants.h',
@@ skipping 2863 matching lines @@
             'proto_in_dir': '../third_party/cros_system_api/dbus',
             'proto_out_dir': 'chrome/browser/media_transfer_protocol',
           },
           'includes': ['../build/protoc.gypi'],
         },
       ],
      },
     ],
   ],
 }