Include sync.pb.h in sync_data.h.

chrome/chrome_tests_unit.gypi

 # 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
       'dependencies': [
         # NOTE: New dependencies should generally be added in the OS!="ios"
         # dependencies block below, rather than here.
         'browser',
+        'browser_real',

[maniscalco, 2014/03/07 23:44:39]

Needed because ui_test_utils.h includes history_service.h (which is part of
browser_real).

[Nico, 2014/03/08 00:45:57]

I think browser_real is supposed to be an implementation detail of the target
'browser' (as in, all 'browser' does is depend on 'browser_real' and export its
settings). So I'm not sure the changes in this file are necessary.

[maniscalco, 2014/03/08 01:27:00]

You're right, this dependency on browser_real is redundant (browser does the
right thing and exports browser_real's dependent settings).  Removed.

However, I believe export_dependent_settings of browser below is necessary.  Of
course, I will confirm with trybots.

         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
         'common',
         '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:password_manager_core_browser_test_support',
         '../components/components.gyp:sync_driver_test_support',
         '../content/content.gyp:content_app_both',
         '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/message_center/message_center.gyp:message_center_test_support',
       ],
       'export_dependent_settings': [
+        'browser_real',

[maniscalco, 2014/03/07 23:44:39]

history_service.h (part of browser_real) includes sync/api/syncable_service.h so
we need to export browser_real's settings.

[maniscalco, 2014/03/08 01:27:00]

Correction: we need to export browser's settings as we've dropped the redundant
dependency on browser_real.

         '../base/base.gyp:test_support_base',
         '../content/content_shell_and_tests.gyp:test_support_content',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'app/chrome_main_delegate.cc',
         'app/chrome_main_delegate.h',
         'browser/android/bookmarks/partner_bookmarks_shim_unittest.cc',
@@ skipping 2838 matching lines @@
             'browser/ui/app_list/test/fake_profile_store.h',
             'browser/ui/app_list/test/fast_show_pickler_unittest.cc',
             'browser/ui/views/app_list/linux/app_list_linux_unittest.cc',
             'browser/ui/views/app_list/win/app_list_win_unittest.cc',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }