Move content/shell/renderer/web_test into a separate build target

It depends on content_shell_lib, which no longer needs to depend on
anything in renderer/web_test.

R=avi@chromium.org

Bug: 866140
Change-Id: I62b472b8ac3d22176ef6a55609b5ada80d50a540
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134487
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756391}

content/shell/BUILD.gn

@@ -63,7 +63,7 @@ mojom("web_test_common_mojom") {
   ]
 }
 
-source_set("web_test_common") {
+static_library("web_test_common") {
   testonly = true
   sources = [
     "common/web_test/web_test_constants.h",
@@ -86,6 +86,44 @@ source_set("web_test_common") {
   ]
 }
 
+static_library("web_test_renderer") {
+  testonly = true
+  sources = [
+    "renderer/web_test/blink_test_helpers.cc",
+    "renderer/web_test/blink_test_helpers.h",
+    "renderer/web_test/blink_test_runner.cc",
+    "renderer/web_test/blink_test_runner.h",
+    "renderer/web_test/test_websocket_handshake_throttle_provider.cc",
+    "renderer/web_test/test_websocket_handshake_throttle_provider.h",
+    "renderer/web_test/web_test_content_renderer_client.cc",
+    "renderer/web_test/web_test_content_renderer_client.h",
+    "renderer/web_test/web_test_render_frame_observer.cc",
+    "renderer/web_test/web_test_render_frame_observer.h",
+    "renderer/web_test/web_test_render_thread_observer.cc",
+    "renderer/web_test/web_test_render_thread_observer.h",
+  ]
+  deps = [
+    ":content_shell_lib",
+    ":web_test_common",
+    "//components/plugins/renderer",
+    "//components/web_cache/renderer",
+    "//content/shell/test_runner",
+    "//content/test:web_test_support_renderer",
+    "//media/capture",
+    "//skia",
+    "//skia:test_fonts",
+    "//third_party/blink/public:blink_headers",
+    "//third_party/blink/public:test_headers",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//v8",
+  ]
+
+  # Annoyingly, this target and web_test_support_renderer have circular
+  # includes.
+  allow_circular_includes_from = [ "//content/test:web_test_support_renderer" ]
+}
+
 # This component provides a ContentMainDelegate for Content Shell and derived
 # applications. This delegate is the central place that creates interfaces for
 # each type of process (browser, renderer, etc). This implementation of
@@ -112,6 +150,8 @@ static_library("content_shell_app") {
   ]
   deps = [
     ":content_shell_lib",
+    ":web_test_common",
+    ":web_test_renderer",
     "//content/public/app:both",
     "//v8",
   ]
@@ -250,18 +290,6 @@ static_library("content_shell_lib") {
     "renderer/shell_content_renderer_client.h",
     "renderer/shell_render_view_observer.cc",
     "renderer/shell_render_view_observer.h",
-    "renderer/web_test/blink_test_helpers.cc",
-    "renderer/web_test/blink_test_helpers.h",
-    "renderer/web_test/blink_test_runner.cc",
-    "renderer/web_test/blink_test_runner.h",
-    "renderer/web_test/test_websocket_handshake_throttle_provider.cc",
-    "renderer/web_test/test_websocket_handshake_throttle_provider.h",
-    "renderer/web_test/web_test_content_renderer_client.cc",
-    "renderer/web_test/web_test_content_renderer_client.h",
-    "renderer/web_test/web_test_render_frame_observer.cc",
-    "renderer/web_test/web_test_render_frame_observer.h",
-    "renderer/web_test/web_test_render_thread_observer.cc",
-    "renderer/web_test/web_test_render_thread_observer.h",
     "utility/shell_content_utility_client.cc",
     "utility/shell_content_utility_client.h",
   ]
@@ -312,7 +340,6 @@ static_library("content_shell_lib") {
     "//components/download/public/common:public",
     "//components/keyed_service/content",
     "//components/network_session_configurator/browser",
-    "//components/plugins/renderer",
     "//components/services/storage/test_api",
     "//components/url_formatter",
     "//components/web_cache/renderer",
@@ -328,7 +355,6 @@ static_library("content_shell_lib") {
     "//content/test:mojo_web_test_bindings",
     "//content/test:test_support",
     "//content/test:web_test_support_browser",
-    "//content/test:web_test_support_renderer",
     "//device/bluetooth",
     "//device/bluetooth:fake_bluetooth",
     "//device/bluetooth:mocks",
@@ -336,7 +362,6 @@ static_library("content_shell_lib") {
     "//gin",
     "//gpu",
     "//media",
-    "//media/capture",
     "//media/mojo:buildflags",
     "//net",
     "//net:net_resources",
@@ -351,7 +376,6 @@ static_library("content_shell_lib") {
     "//services/test/echo:lib",
     "//services/test/echo/public/mojom",
     "//skia",
-    "//skia:test_fonts",
     "//storage/browser",
     "//testing/gmock",
     "//testing/gtest",
@@ -388,9 +412,6 @@ static_library("content_shell_lib") {
     deps += [ "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy" ]
   }
 
-  # Annoyingly, this target and web_test_support have circular includes.
-  allow_circular_includes_from = [ "//content/test:web_test_support_renderer" ]
-
   if (enable_plugins) {
     deps += [
       "//cc/paint",