Revert of Eliminate browser test helpers from unit tests. (patchset #15 id:280001 of https://codereview.chromium.org/1613123002/ )

Reason for revert:
Seems likely to have broken cros compile here: https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20GN%20%28dbg%29/builds/17397

Original issue's description:
> Eliminate browser test helpers from unit tests.
>
> This change eliminates dependencies of browser_test_utils.h and
> in_process_browser_test.h from unit tests and eliminates the future
> possibility of adding them back by changing gn and gyp configurations.
>
> This also renames one test from "unit" to "browser" as it seems more
> appropriate for the case.
>
> BUG=514788
>
> Committed: https://crrev.com/ce7050d878ea3cdfc8445903d00107cb2ba8b252
> Cr-Commit-Position: refs/heads/master@{#372679}

TBR=blundell@chromium.org,phajdan.jr@chromium.org,jam@chromium.org,carlosk@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=514788

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

Cr-Commit-Position: refs/heads/master@{#372685}

16 files changed, 12 insertions, 100 deletions

diff --git a/chrome/browser/predictors/resource_prefetch_common_unittest.cc b/chrome/browser/predictors/resource_prefetch_common_unittest.cc
index 14cfa32..59ef5c4 100644
--- a/chrome/browser/predictors/resource_prefetch_common_unittest.cc
+++ b/chrome/browser/predictors/resource_prefetch_common_unittest.cc
@@ -13,11 +13,11 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/variations/entropy_provider.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/network_change_notifier.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 using chrome_browser_net::NetworkPredictionOptions;
 using net::NetworkChangeNotifier;
diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
index 0800c50..8c015ed 100644
--- a/chrome/browser/resources/chromeos/chromevox/BUILD.gn
+++ b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
@@ -326,7 +326,6 @@ test("chromevox_tests") {
     "//chrome/renderer",
     "//chrome/test:test_support",
     "//chrome/test:test_support_ui",
-    "//content/test:browsertest_base",
     "//testing/gmock",
     "//testing/gtest",
   ]
diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
index e683b09..e6c0f82 100644
--- a/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
+++ b/chrome/browser/resources/chromeos/chromevox/chromevox_tests.gypi
@@ -106,7 +106,6 @@
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
-        '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_base',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
diff --git a/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc b/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
index 4b35777..046df0c 100644
--- a/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
+++ b/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index faf4a3b..c351742 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -883,7 +883,7 @@
       'test/remoting/unauthenticated_browsertest.cc',
       'test/remoting/waiter.cc',
       'test/remoting/waiter.h',
-      'test/remoting/webapp_javascript_browsertest.cc',
+      'test/remoting/webapp_javascript_unittest.cc',
     ],
     'chrome_browser_tests_supervised_user_sources': [
       'browser/supervised_user/supervised_user_browsertest.cc',
@@ -1628,7 +1628,6 @@
         '../components/components.gyp:guest_view_test_support',
         '../components/components_resources.gyp:components_resources',
         '../content/app/resources/content_resources.gyp:content_resources',
-        '../content/content_shell_and_tests.gyp:content_browser_test_base',
         '../crypto/crypto.gyp:crypto_test_support',
         '../google_apis/google_apis.gyp:google_apis_test_support',
         '../net/net.gyp:net',
@@ -2130,7 +2129,6 @@
         '../components/components.gyp:ui_zoom_test_support',
         '../components/components_resources.gyp:components_resources',
         '../components/components_strings.gyp:components_strings',
-        '../content/content_shell_and_tests.gyp:content_browser_test_base',
         '../crypto/crypto.gyp:crypto_test_support',
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../device/serial/serial.gyp:device_serial_test_util',
@@ -2650,7 +2648,6 @@
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../components/components.gyp:autofill_content_test_support',
-        '../content/content_shell_and_tests.gyp:content_browser_test_base',
         '../media/cast/cast.gyp:cast_test_utility',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
@@ -2791,12 +2788,11 @@
         '../base/base.gyp:base',
         '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:invalidation_test_support',
-        '../content/content_shell_and_tests.gyp:content_browser_test_base',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../sync/sync.gyp:sync',
-        '../sync/sync.gyp:test_support_sync_fake_server',
         '../sync/sync.gyp:test_support_sync_testserver',
+        '../sync/sync.gyp:test_support_sync_fake_server',
         '../ui/app_list/app_list.gyp:app_list_test_support',
       ],
       'include_dirs': [
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 7b19882..ea7f8c9 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -346,7 +346,6 @@ if (!is_android) {
       "//chrome/renderer",
       "//components/resources",
       "//content/app/resources",
-      "//content/test:browsertest_base",
       "//crypto:platform",
       "//crypto:test_support",
       "//google_apis:test_support",
@@ -591,7 +590,6 @@ if (!is_android) {
       "//chrome",
       "//components/invalidation/impl",
       "//components/invalidation/impl:test_support",
-      "//content/test:browsertest_base",
       "//net",
       "//skia",
       "//sync",
@@ -874,7 +872,6 @@ if (!is_android) {
       "//components/strings",
       "//components/translate/core/common",
       "//components/user_manager:test_support",
-      "//content/test:browsertest_base",
       "//crypto:platform",
       "//crypto:test_support",
       "//device/bluetooth:mocks",
@@ -1544,9 +1541,9 @@ test("unit_tests") {
     "//chrome:child_dependencies",
 
     # 2) test-specific support libraries:
-    ":test_support",
     ":test_support_unit",
     "//base/test:test_support",
+    "//chrome/test:test_support",
     "//components/browser_sync/browser:test_support",
     "//components/content_settings/core/test:test_support",
     "//components/resources",
@@ -2165,7 +2162,6 @@ if (is_win || (is_linux && !is_chromeos)) {
       "//components/about_handler",
       "//components/autofill/content/browser/wallet:test_support",
       "//components/autofill/content/renderer:test_support",
-      "//content/test:browsertest_base",
       "//media/cast:test_support",
       "//testing/gmock",
       "//testing/gtest",
diff --git a/chrome/test/remoting/webapp_javascript_browsertest.cc b/chrome/test/remoting/webapp_javascript_unittest.cc
index d04f261..d04f261 100644
--- a/chrome/test/remoting/webapp_javascript_browsertest.cc
+++ b/chrome/test/remoting/webapp_javascript_unittest.cc
diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
index 597033e..f187fe3 100644
--- a/chromecast/browser/BUILD.gn
+++ b/chromecast/browser/BUILD.gn
@@ -157,7 +157,6 @@ source_set("test_support") {
   public_deps = [
     ":browser",
     "//chromecast:cast_shell_common",
-    "//content/test:browsertest_base",
   ]
 
   deps = [
@@ -185,7 +184,6 @@ test("cast_shell_browser_test") {
   deps = [
     ":test_support",
     "//base",
-    "//content/test:browsertest_base",
     "//content/test:test_support",
     "//media/base:test_support",
     "//testing/gtest",
diff --git a/chromecast/chromecast_tests.gypi b/chromecast/chromecast_tests.gypi
index 804d673..7fbbde9 100644
--- a/chromecast/chromecast_tests.gypi
+++ b/chromecast/chromecast_tests.gypi
@@ -338,14 +338,10 @@
           ],
           'dependencies': [
             'cast_shell_core',
-            '../content/content_shell_and_tests.gyp:content_browser_test_base',
             '../content/content_shell_and_tests.gyp:content_browser_test_support',
             '../testing/gtest.gyp:gtest',
             '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
           ],
-          'export_dependent_settings': [
-            '../content/content_shell_and_tests.gyp:content_browser_test_base',
-          ],
           'sources': [
             'browser/test/chromecast_browser_test.cc',
             'browser/test/chromecast_browser_test.h',
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 4a6c87d..9841da3 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -383,7 +383,6 @@ test("components_browsertests") {
       "//components/password_manager/content/renderer",
       "//components/tracing",
       "//content/shell:content_shell_lib",
-      "//content/test:browsertest_base",
       "//content/test:browsertest_support",
       "//content/test:test_support",
       "//device/bluetooth",
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 3cb90e3..4a934f7 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -1727,7 +1727,6 @@
             '../content/content.gyp:content_gpu',
             '../content/content.gyp:content_plugin',
             '../content/content.gyp:content_renderer',
-            '../content/content_shell_and_tests.gyp:content_browser_test_base',
             '../content/content_shell_and_tests.gyp:content_browser_test_support',
             '../content/content_shell_and_tests.gyp:content_shell_lib',
             '../content/content_shell_and_tests.gyp:content_shell_pak',
diff --git a/components/guest_view/browser/test_guest_view_manager.h b/components/guest_view/browser/test_guest_view_manager.h
index 0682006..bd6c7d5 100644
--- a/components/guest_view/browser/test_guest_view_manager.h
+++ b/components/guest_view/browser/test_guest_view_manager.h
@@ -12,6 +12,7 @@
 #include "base/memory/linked_ptr.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/guest_view/browser/guest_view_manager_factory.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 
 namespace guest_view {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 00fe581..c728421 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -26,6 +26,11 @@
       'public/test/async_file_test_helper.h',
       'public/test/background_sync_test_util.cc',
       'public/test/background_sync_test_util.h',
+      'public/test/browser_test.h',
+      'public/test/browser_test_base.cc',
+      'public/test/browser_test_base.h',
+      'public/test/browser_test_utils.cc',
+      'public/test/browser_test_utils.h',
       'public/test/content_test_suite_base.cc',
       'public/test/content_test_suite_base.h',
       'public/test/download_test_observer.cc',
@@ -1358,9 +1363,7 @@
           ],
         },
         {
-          # GN version: //content/test:browsertest_support
-          # content_browser_test_support can be used by targets that run
-          # content_shell based browser tests.
+          # GN version: //content/tests:browsertest_support
           'target_name': 'content_browser_test_support',
           'type': 'static_library',
           'dependencies': [
@@ -1400,42 +1403,6 @@
           ],
         },
         {
-          # GN version: //content/test:browsertest_base
-          # content_browser_test_base can be used by any browser test target.
-          'target_name': 'content_browser_test_base',
-          'type': 'static_library',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../net/net.gyp:net_test_support',
-            '../testing/gtest.gyp:gtest',
-            '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
-            '../ui/base/ui_base.gyp:ui_base',
-            '../ui/base/ui_base.gyp:ui_base_test_support',
-            '../ui/events/events.gyp:events_test_support',
-            'content.gyp:content_browser',
-            'content.gyp:content_common',
-          ],
-          'export_dependent_settings': [
-            'content.gyp:content_browser',
-          ],
-          'sources': [
-            # Source list duplicated in GN build.
-            'public/test/browser_test.h',
-            'public/test/browser_test_base.cc',
-            'public/test/browser_test_base.h',
-            'public/test/browser_test_utils.cc',
-            'public/test/browser_test_utils.h',
-          ],
-          'conditions': [
-            ['OS != "ios"', {
-              'dependencies': [ '../third_party/WebKit/public/blink.gyp:blink' ],
-              'export_dependent_settings': [
-                '../third_party/WebKit/public/blink.gyp:blink',
-              ],
-            }],
-          ],
-        },
-        {
           # GN version: //content/test:test_mojo_bindings
           'target_name': 'content_test_mojo_bindings',
           'type': 'static_library',
@@ -1470,7 +1437,6 @@
             'content.gyp:content_plugin',
             'content.gyp:content_renderer',
             'content.gyp:content_resources',
-            'content_browser_test_base',
             'content_browser_test_support',
             'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
             'content_shell_lib',
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 2c619c8..b6f22ab 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -194,8 +194,6 @@ source_set("test_support") {
   }
 }
 
-# browsertest_support can be used by targets that run content_shell based
-# browser tests.
 source_set("browsertest_support") {
   testonly = true
 
@@ -226,39 +224,6 @@ source_set("browsertest_support") {
   configs += [ "//v8:external_startup_data" ]
 }
 
-# browsertest_base can be used by any browser test target.
-source_set("browsertest_base") {
-  testonly = true
-
-  sources = [
-    "../public/test/browser_test.h",
-    "../public/test/browser_test_base.cc",
-    "../public/test/browser_test_base.h",
-    "../public/test/browser_test_utils.cc",
-    "../public/test/browser_test_utils.h",
-  ]
-
-  public_deps = [
-    "//content/public/browser",
-    "//content/public/common",
-  ]
-  deps = [
-    "//base:base",
-    "//net:test_support",
-    "//testing/gtest",
-    "//ui/base",
-    "//ui/base:test_support",
-    "//ui/base/ime",
-    "//ui/events:dom_keycode_converter",
-    "//ui/events:events_base",
-    "//ui/events:gesture_detection",
-    "//ui/resources",
-  ]
-  if (!is_ios) {
-    public_deps += [ "//third_party/WebKit/public:blink" ]
-  }
-}
-
 mojom("content_test_mojo_bindings") {
   sources = [
     "../public/test/test_mojo_service.mojom",
@@ -393,7 +358,6 @@ test("content_browsertests") {
   ]
 
   deps = [
-    ":browsertest_base",
     ":browsertest_support",
     ":web_ui_test_mojo_bindings",
     "//base/test:test_support",
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index e3600d8..45db1d7 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -254,7 +254,6 @@ test("extensions_browsertests") {
     "//base/test:test_support",
     "//components/prefs:test_support",
     "//components/storage_monitor:test_support",
-    "//content/test:browsertest_base",
     "//content/test:test_support",
     "//device/bluetooth:mocks",
     "//device/core:mocks",
diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp
index b4185cd..c0f059d 100644
--- a/extensions/extensions_tests.gyp
+++ b/extensions/extensions_tests.gyp
@@ -77,7 +77,6 @@
         '<(DEPTH)/components/components.gyp:guest_view_renderer',
         '<(DEPTH)/components/components.gyp:guest_view_test_support',
         '<(DEPTH)/content/content.gyp:content_app_both',
-        '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_base',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_support',
         '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
         '<(DEPTH)/device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',