Add (not yet working) content_browsertests target.

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 102827)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -473,7 +473,10 @@
       'include_dirs': [
         '..',
       ],
-      'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'BROWSER_TESTS_USE_CHROME',
+      ],
       'sources': [
         'browser/accessibility/accessibility_mac_uitest.mm',
         'browser/autofill/autofill_browsertest.cc',
@@ -497,9 +500,9 @@
         'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
         'browser/ui/views/tabs/tab_dragging_test.cc',
         'browser/ui/webui/workers_ui_browsertest.cc',
-        'test/base/out_of_proc_test_runner.cc',
         'test/base/view_event_test_base.cc',
         'test/base/view_event_test_base.h',
+        '../content/test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -2181,7 +2184,10 @@
       'include_dirs': [
         '..',
       ],
-      'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'BROWSER_TESTS_USE_CHROME',
+      ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
         'app/chrome_command_ids.h',
@@ -2441,7 +2447,6 @@
         'test/base/in_process_browser_test_browsertest.cc',
         'test/base/render_view_test.cc',
         'test/base/render_view_test.h',
-        'test/base/out_of_proc_test_runner.cc',
         'test/data/webui/assertions.js',
         'test/data/webui/async_gen-inl.h',
         'test/data/webui/async_gen.js',
@@ -2471,6 +2476,7 @@
         '../content/renderer/render_widget_browsertest.cc',
         '../content/renderer/render_widget_browsertest.h',
         '../content/renderer/v8_value_converter_browsertest.cc',
+        '../content/test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['chromeos==0', {
@@ -2711,11 +2717,14 @@
       'include_dirs': [
         '..',
       ],
-      'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'BROWSER_TESTS_USE_CHROME',
+      ],
       'sources': [
         'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
-        'test/base/out_of_proc_test_runner.cc',
+        '../content/test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['safe_browsing==0', {
@@ -3098,7 +3107,10 @@
         '<(protoc_out_dir)',
       ],
       # TODO(phajdan.jr): Only temporary, to make transition easier.
-      'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'BROWSER_TESTS_USE_CHROME',
+      ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
@@ -3107,7 +3119,6 @@
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
-        'test/base/out_of_proc_test_runner.cc',
         'test/data/resource.rc',
         'browser/sync/test/integration/apps_helper.cc',
         'browser/sync/test/integration/apps_helper.h',
@@ -3163,6 +3174,7 @@
         'browser/sync/test/integration/two_client_typed_urls_sync_test.cc',
         'browser/sync/test/integration/typed_urls_helper.cc',
         'browser/sync/test/integration/typed_urls_helper.h',
+        '../content/test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -3245,7 +3257,10 @@
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
-      'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'BROWSER_TESTS_USE_CHROME',
+      ],
       'sources': [
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
@@ -3280,8 +3295,8 @@
         'browser/sync/test/integration/sync_test.h',
         'browser/sync/test/integration/typed_urls_helper.cc',
         'browser/sync/test/integration/typed_urls_helper.h',
-        'test/base/out_of_proc_test_runner.cc',
         'test/data/resource.rc',
+        '../content/test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -3377,13 +3392,16 @@
         '..',
         '<(test_list_out_dir)',
       ],
-      'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER' ],
+      'defines': [
+        'HAS_OUT_OF_PROC_TEST_RUNNER',
+        'BROWSER_TESTS_USE_CHROME',
+      ],
       'sources': [
         'browser/gpu_pixel_browsertest.cc',
         'browser/gpu_crash_browsertest.cc',
-        'test/base/out_of_proc_test_runner.cc',
         'test/gpu/webgl_conformance_tests.cc',
         '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h',
+        '../content/test/out_of_proc_test_runner.cc',
       ],
       # hard_dependency is necessary for this target because it has actions
       # that generate a header file included by dependent targets. The header