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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0a9af8d1059e65e4d2a4db192dd7309273221c6c..68bbca18a5b7ab6dd0c18ac4434788f3095d6c4e 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -503,13 +503,13 @@
       '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',
@@ -1715,6 +1715,7 @@
         '_USE_32BIT_TIME_T',
       ],
       'dependencies': [
+        'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'common',
         'debugger',
         '../skia/skia.gyp:skia',
@@ -1722,7 +1723,6 @@
         '../testing/gtest.gyp:gtest',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         'syncapi',
-        'sync_proto',
         'test_support_unit',
       ],
       'conditions': [
@@ -1810,15 +1810,14 @@
       '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',
@@ -1840,6 +1839,9 @@
         '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',