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

chrome/chrome_tests.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.
 
 {
   'variables' : {
     'browser_tests_sources_views_specific': [
       'browser/extensions/browser_action_test_util_views.cc',
       'browser/views/browser_actions_container_browsertest.cc',
     ],
@@ skipping 485 matching lines @@
           },
         }],
       ],
     },
     {
       'target_name': 'unit_tests',
       'type': 'executable',
       'msvs_guid': 'ECFC2BEC-9FC0-4AD9-9649-5F26793F65FC',
       'dependencies': [
         'browser',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'chrome',
         'chrome_resources',
         'chrome_strings',
         'common',
         'debugger',
         'renderer',
-        'sync_proto',
         'test_support_unit',
         'utility',
         '../app/app.gyp:app_base',
         '../app/app.gyp:app_resources',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_resources',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../webkit/webkit.gyp:webkit_resources',
         '../skia/skia.gyp:skia',
@@ skipping 1185 matching lines @@
       'include_dirs': [
         '..',
         '<(protoc_out_dir)',
       ],
       'defines' : [
         'SYNC_ENGINE_VERSION_STRING="Unknown"',
         '_CRT_SECURE_NO_WARNINGS',
         '_USE_32BIT_TIME_T',
       ],
       'dependencies': [
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'common',
         'debugger',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'syncapi',
-        'sync_proto',
         'test_support_unit',
       ],
       'conditions': [
         ['OS=="win"', {
           'sources' : [
             'browser/sync/util/data_encryption_unittest.cc',
           ],
           'dependencies': [
             '<(allocator_target)',
           ],
@@ skipping 67 matching lines @@
             '../build/linux/system.gyp:gtk',
           ],
         }],
       ],
     },
     {
       'target_name': 'sync_integration_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'chrome',
         'chrome_resources',
         'common',
         'debugger',
         'renderer',
-        'chrome_resources',
         'chrome_strings',
-        'sync_proto',
-        'test_support_unit',
+        'test_support_common',
         '../net/net.gyp:net_test_support',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/chrome_dll_resource.h',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
+        'test/test_launcher/out_of_proc_test_runner.cc',
+        'test/test_launcher/test_runner.cc',
+        'test/test_launcher/test_runner.h',
         'test/live_sync/bookmark_model_verifier.cc',
         'test/live_sync/bookmark_model_verifier.h',
         'test/live_sync/live_sync_test.cc',
         'test/live_sync/live_sync_test.h',
         'test/live_sync/profile_sync_service_test_harness.cc',
         'test/live_sync/profile_sync_service_test_harness.h',
         'test/live_sync/single_client_live_bookmarks_sync_unittest.cc',
         'test/live_sync/single_client_live_preferences_sync_unittest.cc',
         'test/live_sync/two_client_live_bookmarks_sync_test.cc',
         'test/live_sync/two_client_live_preferences_sync_test.cc',
@@ skipping 421 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: