From 1df020499740ab5a55bb209b1afc3c911ac487b4 Mon Sep 17 00:00:00 2001
From: "jam@chromium.org"
 <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 22 Nov 2013 23:04:11 +0000
Subject: [PATCH] Remove the test_support_chrome  target, since it duplicates
 test_support_common. The latter is where we already put all test-harness
 specific code, even if it's only used in browser tests.

R=phajdan.jr@chromium.org

Review URL: https://codereview.chromium.org/83863005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236856 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome_tests.gypi      | 23 -----------------------
 chrome/chrome_tests_unit.gypi |  2 ++
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 8325e004e77d02..4c3c8c57a3cf34 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -61,24 +61,6 @@
     'js_unittest_vars.gypi',
   ],
   'targets': [
-    {
-      'target_name': 'test_support_chrome',
-      'type': 'static_library',
-      'dependencies': [
-        'test_support_common',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'export_dependent_settings': [
-        'test_support_common',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'test/base/chrome_test_launcher.cc',
-        'test/base/chrome_test_launcher.h',
-      ],
-    },
     {
       'target_name': 'test_support_ui_runner',
       'type': 'static_library',
@@ -157,7 +139,6 @@
         'common/extensions/api/api.gyp:api',
         'debugger',
         'renderer',
-        'test_support_chrome',
         'test_support_common',
         # NOTE: don't add test_support_ui, no more UITests. See
         # http://crbug.com/137365
@@ -927,7 +908,6 @@
         'common/extensions/api/api.gyp:api',
         'renderer',
         'test/perf/perf_test.gyp:*',
-        'test_support_chrome',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ -2056,7 +2036,6 @@
         'chrome_resources.gyp:packed_resources',
         'renderer',
         'test/perf/perf_test.gyp:*',
-        'test_support_chrome',
         'test_support_common',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ -2324,7 +2303,6 @@
         'common',
         'common/extensions/api/api.gyp:api',
         'renderer',
-        'test_support_chrome',
         'test_support_common',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
@@ -2511,7 +2489,6 @@
         'chrome',
         'common/extensions/api/api.gyp:api',
         'test/perf/perf_test.gyp:*',
-        'test_support_chrome',
         'test_support_common',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index f47a2e97c2d0c6..8ada2e75f66fb7 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -230,6 +230,8 @@
         'test/base/chrome_process_util_mac.cc',
         'test/base/chrome_render_view_host_test_harness.cc',
         'test/base/chrome_render_view_host_test_harness.h',
+        'test/base/chrome_test_launcher.cc',
+        'test/base/chrome_test_launcher.h',
         'test/base/chrome_test_suite.cc',
         'test/base/chrome_test_suite.h',
         'test/base/find_in_page_observer.cc',