Re-apply http://codereview.chromium.org/1622012

chrome/chrome_browser.gypi

 # Copyright (c) 2010 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': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
       'dependencies': [
         'common',
         'chrome_resources',
         'chrome_strings',
         'chrome_version_info',
         'component_extensions',
         'domui_shared_resources',
         'net_internals_resources',
         'platform_locale_settings',
-        'sync_proto',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'syncapi',
         'theme_resources',
         '../app/app.gyp:app_resources',
         '../app/app.gyp:app_strings',
         '../media/media.gyp:media',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/expat/expat.gyp:expat',
         '../third_party/icu/icu.gyp:icui18n',
@@ skipping 3356 matching lines @@
       ]
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: