Revert of Content "gn check" work. (patchset #10 id:180001 of https://codereview.chromium.org/1828483002/ )

Reason for revert:
Broke https://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/19740/steps/compile/logs/stdio

Original issue's description:
> Content "gn check" work.
>
> Make content/gpu and content/plugin pass GN check.
>
> Makes most of content/shell and content/test pass check. These are not all enabled yet pending a few remaining issues that are more difficult to solve.
>
> The private content targets now allow content/test to include headers from them for non-component builds. Checking is disabled for content/test in component builds as described in the comment at the top of //content/BUILD.gn
>
> Renames the ui/events/ipc according to GN style
>
> BUG=
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
> TBR=jschuh (IPC build tweak)
>
> Committed: https://crrev.com/f510be61306f5e4986eceb1f8686bfcc934cd400
> Cr-Commit-Position: refs/heads/master@{#383208}

TBR=jam@chromium.org,jschuh@chromium.org,dcheng@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

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

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

14 files changed, 22 insertions, 255 deletions

diff --git a/content/BUILD.gn b/content/BUILD.gn
index 307c078..1d32ad2 100644
--- a/content/BUILD.gn
+++ b/content/BUILD.gn
@@ -37,23 +37,6 @@ config("content_implementation") {
 # //content/public/browser and similar targets to avoid double-linking (these
 # targets make sure the dependency goes through the content shared library
 # when doing a component build).
-#
-# TESTS
-# -----
-# Tests are a challenge. The content tests need to access internals of
-# content/browser, for example, but the tests themselves are outside of the
-# content component (which is a shared library in the component build). To
-# prevent external-to-content targets from depending on private headers,
-# the non-public content/browser target is not a public dep of the content
-# component. But this means there is also no public path for the content
-# tests and no way to restrict that just to //content/test/* if we added one.
-#
-# As a result, we check deps for //content/test/* only in non-component builds
-# (which should verify the dependencies are correct for both component and
-# non-component cases equally). There are targets like
-# //content/browser:for_content_tests that allow content/test to depend on the
-# //content/browser target only in non-component builds (when there are no
-# linking problems) for when check is enabled.
 
 if (!is_nacl_nonsfi) {
   content_shared_components = [
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index 1d06bca..abe8a75 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -67,26 +67,13 @@ if (!is_multi_dll_chrome) {
 source_set("both") {
   # Only the public target should depend on this. All other targets (even
   # internal content ones) should depend on the public one.
-  visibility = [
-    ":*",
-    "//content/public/app:*",
-  ]
+  visibility = [ "//content/public/app:*" ]
 
   sources = content_app_sources
   configs += content_app_extra_configs
   deps = content_app_deps
 }
 
-# See comment at the top of //content/BUILD.gn for how this works.
-group("both_for_content_tests") {
-  visibility = [ "//content/test/*" ]
-  if (!is_component_build) {
-    public_deps = [
-      ":both",
-    ]
-  }
-}
-
 if (is_multi_dll_chrome) {
   # It doesn't make sense to do the browser/child dll split in component mode.
   assert(!is_component_build)
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index fcd1572..9245309 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -11,10 +11,7 @@ import("//mojo/public/mojo_application_manifest.gni")
 source_set("browser") {
   # Only the public target should depend on this. All other targets (even
   # internal content ones) should depend on the public one.
-  visibility = [
-    ":for_content_tests",
-    "//content/public/browser:browser_sources",
-  ]
+  visibility = [ "//content/public/browser:browser_sources" ]
 
   configs += [
     "//build/config:precompiled_headers",
@@ -529,16 +526,6 @@ source_set("browser") {
   }
 }
 
-# See comment at the top of //content/BUILD.gn for how this works.
-group("for_content_tests") {
-  visibility = [ "//content/test/*" ]
-  if (!is_component_build) {
-    public_deps = [
-      ":browser",
-    ]
-  }
-}
-
 mojo_application_manifest("chrome_manifest") {
   type = "exe"
   application_name = "chrome"
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index 6420d7a..ee79f18 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -7,18 +7,9 @@ import("//build/config/ui.gni")
 import("//content/child/child.gni")
 
 source_set("child") {
-  # Targets external to content should always link to the public API.
-  # Internal targets can link to this but only if they're child processes
-  # (i.e. not content/browser or content/common) and only if they're inside the
-  # content component (i.e. not content/test or content/shell).
-  visibility = [
-    "//content/gpu/*",
-    "//content/plugin/*",
-    "//content/ppapi_plugin/*",
-    "//content/public/child:child_sources",
-    "//content/renderer/*",
-    "//content/utility/*",
-  ]
+  # Only the public target should depend on this. All other targets (even
+  # internal content ones) should depend on the public one.
+  visibility = [ "//content/public/child:child_sources" ]
 
   sources = rebase_path(content_child_gypi_values.private_child_sources,
                         ".",
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 5631998..36c5057 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -195,7 +195,7 @@ source_set("common") {
     "//ui/accessibility",
     "//ui/base",
     "//ui/base/ime",
-    "//ui/events/ipc",
+    "//ui/events/ipc:events_ipc",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/ipc",
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
index c55710a..7736a55 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -42,19 +42,14 @@ source_set("gpu_sources") {
 
   deps = [
     "//base",
-    "//base/third_party/dynamic_annotations",
-    "//components/tracing",
     "//content:export",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//gpu:gpu",
     "//gpu/ipc/common:command_buffer_traits",
     "//ipc",
-    "//media/mojo/services:application_factory",
     "//mojo/shell/public/interfaces",
     "//skia",
-    "//ui/events/ipc",
-    "//ui/gfx/ipc",
     "//ui/gl",
   ]
 
@@ -73,7 +68,6 @@ source_set("gpu_sources") {
     ]
     libs = [ "setupapi.lib" ]
     deps += [
-      "//sandbox",
       "//third_party/angle:libEGL",
       "//third_party/angle:libGLESv2",
     ]
@@ -87,10 +81,6 @@ source_set("gpu_sources") {
     deps += [ "//ui/events/platform/x11" ]
   }
 
-  if (use_ozone) {
-    deps += [ "//ui/ozone" ]
-  }
-
   if (enable_vulkan) {
     deps += [ "//gpu/vulkan" ]
   }
diff --git a/content/plugin/BUILD.gn b/content/plugin/BUILD.gn
index 94dc6d8..6e87a12 100644
--- a/content/plugin/BUILD.gn
+++ b/content/plugin/BUILD.gn
@@ -32,19 +32,12 @@ if (enable_plugins && !is_linux) {
 
     deps = [
       "//content:export",
-      "//content/child",
       "//content/public/common:common_sources",
       "//mojo/shell/public/interfaces",
       "//skia",
       "//third_party/WebKit/public:blink",
       "//third_party/npapi",
-      "//ui/gfx",
-      "//ui/surface",
     ]
-
-    if (is_win) {
-      deps += [ "//sandbox" ]
-    }
   }
 } else {
   # This way it can be unconditionally depended on.
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 4d6d84c..643cb8f 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -40,7 +40,7 @@ source_set("browser_sources") {
   ]
   deps = [
     "//cc",
-    "//content/browser",  # Must not be public_deps!
+    "//content/browser",
     "//content/public/common:common_sources",
     "//gpu",
     "//media",
diff --git a/content/public/gpu/BUILD.gn b/content/public/gpu/BUILD.gn
index c4c12f0..2b6668f 100644
--- a/content/public/gpu/BUILD.gn
+++ b/content/public/gpu/BUILD.gn
@@ -33,6 +33,4 @@ source_set("gpu_sources") {
     "//gpu/config:config_sources",
     "//media:media",
   ]
-
-  allow_circular_includes_from = [ "//content/gpu:gpu_sources" ]
 }
diff --git a/content/public/plugin/BUILD.gn b/content/public/plugin/BUILD.gn
index 1a0bfd9..e4c4d36 100644
--- a/content/public/plugin/BUILD.gn
+++ b/content/public/plugin/BUILD.gn
@@ -24,13 +24,7 @@ source_set("plugin_sources") {
 
   deps = [
     "//base",
-    "//content/plugin",  # Must not be a public dep.
-    "//content/public/common:common_sources",
-  ]
-
-  allow_circular_includes_from = [
-    # This target is a pair with content/plugin. They always go together and
-    # include headers from each other.
     "//content/plugin",
+    "//content/public/common:common_sources",
   ]
 }
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index fa80b40..bf45546 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -10,10 +10,7 @@ import("//media/media_options.gni")
 source_set("renderer") {
   # Only the public target should depend on this. All other targets (even
   # internal content ones) should depend on the public one.
-  visibility = [
-    ":for_content_tests",
-    "//content/public/renderer:renderer_sources",
-  ]
+  visibility = [ "//content/public/renderer:renderer_sources" ]
 
   sources = rebase_path(content_renderer_gypi_values.private_renderer_sources,
                         ".",
@@ -250,13 +247,3 @@ source_set("renderer") {
     deps += [ "//ui/ozone" ]
   }
 }
-
-# See comment at the top of //content/BUILD.gn for how this works.
-group("for_content_tests") {
-  visibility = [ "//content/test/*" ]
-  if (!is_component_build) {
-    public_deps = [
-      ":renderer",
-    ]
-  }
-}
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 865931d..6ce50f8 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -221,14 +221,12 @@ static_library("content_shell_lib") {
     "//content/app/strings",
     "//content/gpu",
     "//content/test:layouttest_support",
-    "//content/test:test_support",
     "//device/bluetooth",
     "//device/bluetooth:mocks",
     "//gin",
     "//gpu",
     "//ipc",
     "//media",
-    "//media/mojo/services:application_factory",
     "//net",
     "//net:net_resources",
     "//skia",
@@ -257,7 +255,6 @@ static_library("content_shell_lib") {
       "//content/ppapi_plugin",
       "//ppapi:blink_deprecated_test_plugin",
       "//ppapi:blink_test_plugin",
-      "//ppapi/shared_impl",
     ]
   }
   if (mojo_media_host == "browser") {
@@ -273,10 +270,7 @@ static_library("content_shell_lib") {
   }
 
   if (is_linux) {
-    deps += [
-      "//build/linux:fontconfig",
-      "//ui/gfx:test_support",
-    ]
+    deps += [ "//build/linux:fontconfig" ]
   }
 
   if (use_x11) {
@@ -295,10 +289,7 @@ static_library("content_shell_lib") {
   }
 
   if (is_posix && !is_mac) {
-    deps += [
-      "//components/crash/content/app",
-      "//components/crash/content/browser",
-    ]
+    deps += [ "//components/crash/content/browser" ]
   }
 
   if (use_aura) {
@@ -317,7 +308,6 @@ static_library("content_shell_lib") {
         "//ui/views",
         "//ui/views:test_support",
         "//ui/views/controls/webview",
-        "//ui/wm:test_support",
       ]
     } else {
       sources += [ "browser/shell_aura.cc" ]
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index f3f2162..acb1539 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -24,12 +24,6 @@ content_tests_gypi_values =
 source_set("test_support") {
   testonly = true
 
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   configs += [
     "//build/config:precompiled_headers",
     "//v8:external_startup_data",
@@ -42,26 +36,19 @@ source_set("test_support") {
     "//third_party/WebKit/public:blink",
   ]
   deps = [
-    ":browsertest_base",
     ":content_test_mojo_bindings",
-    "//base/third_party/dynamic_annotations",
     "//cc",
     "//cc:test_support",
     "//cc/blink",
-    "//cc/surfaces",
     "//components/scheduler:scheduler",
     "//components/scheduler:test_support",
-    "//content/app:both_for_content_tests",
     "//content/browser/speech/proto",
     "//content/gpu",
-    "//content/public/browser",
     "//content/public/child",
     "//content/public/plugin",
     "//content/public/renderer",
     "//content/public/utility",
-    "//content/renderer:for_content_tests",
     "//content/shell:pak",
-    "//content/utility:for_content_tests",
     "//ipc:test_support",
     "//ipc/mojo",
     "//media",
@@ -133,7 +120,6 @@ source_set("test_support") {
     deps += [
       "//third_party/libjingle:libjingle_webrtc",
       "//third_party/libjingle:libpeerconnection",
-      "//third_party/webrtc/base:rtc_base",
       "//third_party/webrtc/modules/video_capture",
     ]
   }
@@ -194,12 +180,6 @@ source_set("test_support") {
 source_set("browsertest_support") {
   testonly = true
 
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   sources = [
     "../public/test/content_browser_test.cc",
     "../public/test/content_browser_test.h",
@@ -212,24 +192,10 @@ source_set("browsertest_support") {
   ]
 
   deps = [
-    ":browsertest_base",
-    ":test_support",
-    "//base",
-    "//base:i18n",
-    "//base/test:test_config",
-    "//base/test:test_support",
-    "//cc/surfaces",
-    "//content/app:both_for_content_tests",
-    "//content/browser:for_content_tests",
     "//content/shell:content_shell_lib",
-    "//gin",
-    "//media",
-    "//net",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility:ax_gen",
-    "//ui/base",
-    "//ui/base/ime",
   ]
 
   if (is_android) {
@@ -254,14 +220,12 @@ source_set("browsertest_base") {
   ]
 
   public_deps = [
-    "//content/browser:for_content_tests",
     "//content/public/browser",
     "//content/public/common",
     "//third_party/WebKit/public:blink",
   ]
   deps = [
     "//base:base",
-    "//content/public/app:both",
     "//net:test_support",
     "//testing/gtest",
     "//ui/base",
@@ -289,13 +253,6 @@ mojom("web_ui_test_mojo_bindings") {
 # GYP version //content/content_tests.gypi:layouttest_support_content
 static_library("layouttest_support") {
   testonly = true
-
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   sources =
       rebase_path(content_tests_gypi_values.layouttest_support_content_sources,
                   ".",
@@ -306,11 +263,7 @@ static_library("layouttest_support") {
     "//cc",
     "//cc/blink",
     "//components/test_runner:test_runner",
-    "//content/browser:for_content_tests",
     "//content/public/common",
-
-    #"//content/shell:content_shell_lib",
-    "//content/renderer:for_content_tests",
     "//mojo/edk/test:test_support",
     "//skia",
     "//ui/accessibility:ax_gen",
@@ -386,12 +339,6 @@ group("content_site_isolation_browsertests") {
 }
 
 test("content_browsertests") {
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   sources = rebase_path(content_tests_gypi_values.content_browsertests_sources,
                         ".",
                         "//content")
@@ -442,22 +389,15 @@ test("content_browsertests") {
   deps = [
     ":browsertest_base",
     ":browsertest_support",
-    ":content_test_mojo_bindings",
     ":web_ui_test_mojo_bindings",
     "//base/test:test_support",
-    "//components/scheduler",
     "//content:resources",
-    "//content/app:both_for_content_tests",
-    "//content/browser:for_content_tests",
     "//content/browser/background_sync:background_sync_proto",
     "//content/common:mojo_bindings",
     "//content/gpu",
-    "//content/public/browser",
-    "//content/public/child",
     "//content/public/common",
     "//content/public/plugin",
     "//content/public/renderer",
-    "//content/renderer:for_content_tests",
     "//content/shell:content_shell_lib",
     "//content/shell:pak",
     "//content/test:test_support",
@@ -466,9 +406,9 @@ test("content_browsertests") {
     "//device/vibration:mojo_bindings",
     "//gin",
     "//gpu",
-    "//gpu/blink",
     "//ipc:test_support",
-    "//media",
+    "//media:media_features",
+    "//media:shared_memory_support",
     "//media:test_support",
     "//media/audio:test_support",
     "//media/base:test_support",
@@ -479,7 +419,6 @@ test("content_browsertests") {
     "//mojo/shell/public/cpp:cpp_for_chromium",
     "//mojo/test:test_support",
     "//net:test_support",
-    "//storage/browser",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/public:blink",
@@ -488,9 +427,8 @@ test("content_browsertests") {
     "//third_party/zlib",
     "//ui/accessibility",
     "//ui/accessibility:ax_gen",
-    "//ui/base:test_support",
+    "//ui/base",
     "//ui/base/ime",
-    "//ui/compositor",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
@@ -509,7 +447,7 @@ test("content_browsertests") {
       "//ppapi/host",
       "//ppapi/proxy",
       "//ppapi/proxy:ipc",
-      "//ppapi/shared_impl:test_support",
+      "//ppapi/shared_impl",
     ]
     data_deps += [ "//ppapi:ppapi_tests" ]
   }
@@ -586,7 +524,6 @@ test("content_browsertests") {
             content_tests_gypi_values.content_browsertests_plugins_sources,
             ".",
             "//content")
-    deps += [ "//ppapi/proxy:test_support" ]
     data_deps += [ "//ppapi:ppapi_tests" ]
   }
 
@@ -606,7 +543,6 @@ test("content_browsertests") {
 
   if (use_aura) {
     deps += [
-      "//ui/aura",
       "//ui/touch_selection:test_support",
       "//ui/touch_selection:touch_selection",
     ]
@@ -620,12 +556,6 @@ test("content_browsertests") {
 }
 
 test("content_unittests") {
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   defines = []
   sources = rebase_path(content_tests_gypi_values.content_unittests_sources,
                         ".",
@@ -643,17 +573,14 @@ test("content_unittests") {
   configs += [ "//build/config:precompiled_headers" ]
 
   deps = [
-    ":content_test_mojo_bindings",
     ":test_support",
     "//base/test:test_support",
     "//base/third_party/dynamic_annotations",
     "//cc",
     "//cc:test_support",
     "//cc/surfaces",
-    "//components/scheduler",
     "//content:resources",
-    "//content/app:both_for_content_tests",
-    "//content/browser:for_content_tests",
+    "//content/browser/background_sync:background_sync_proto",
     "//content/browser/cache_storage:cache_storage_proto",
     "//content/browser/notifications:notification_proto",
     "//content/browser/service_worker:service_worker_proto",
@@ -666,7 +593,6 @@ test("content_unittests") {
     "//content/public/common:mojo_bindings",
     "//content/public/plugin",
     "//content/public/renderer",
-    "//content/renderer:for_content_tests",
     "//crypto",
     "//device/battery",
     "//device/battery:mojo_bindings",
@@ -684,8 +610,6 @@ test("content_unittests") {
     "//mojo/public/cpp/bindings",
     "//net:extras",
     "//net:test_support",
-    "//ppapi/c",
-    "//printing",
     "//skia",
     "//sql",
     "//sql:test_support",
@@ -698,12 +622,11 @@ test("content_unittests") {
     "//third_party/leveldatabase",
     "//third_party/libjingle",
     "//third_party/re2",
-    "//third_party/widevine/cdm:version_h",
     "//ui/accessibility",
-    "//ui/base:test_support",
+    "//ui/base",
     "//ui/compositor:test_support",
     "//ui/events/blink",
-    "//ui/gfx:test_support",
+    "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gfx/ipc",
     "//ui/gl",
@@ -723,11 +646,6 @@ test("content_unittests") {
         rebase_path(content_tests_gypi_values.content_unittests_plugins_sources,
                     ".",
                     "//content")
-    deps += [
-      "//ppapi/host",
-      "//ppapi/proxy:test_support",
-      "//ppapi/shared_impl:test_support",
-    ]
   }
 
   if (enable_webrtc) {
@@ -738,8 +656,6 @@ test("content_unittests") {
     deps += [
       "//third_party/libjingle:libjingle_webrtc",
       "//third_party/libjingle:libpeerconnection",
-      "//third_party/webrtc/base:rtc_base",
-      "//third_party/webrtc/modules/desktop_capture:primitives",
       "//third_party/webrtc/modules/video_capture",
       "//ui/shell_dialogs:shell_dialogs",
     ]
@@ -787,10 +703,7 @@ test("content_unittests") {
     # Search for comments about "xcode_settings" in chrome_tests.gypi.
     ldflags = [ "-Wl,-ObjC" ]
 
-    deps += [
-      "//third_party/mozilla",
-      "//third_party/ocmock",
-    ]
+    deps += [ "//third_party/ocmock" ]
   }
   if (is_chromeos) {
     sources -= [ "../browser/geolocation/wifi_data_provider_linux_unittest.cc" ]
@@ -825,8 +738,7 @@ test("content_unittests") {
   if (use_aura) {
     deps += [
       "//components/mus/public/cpp/tests:unittest_support",
-      "//content/renderer/mus",
-      "//ui/aura:test_support",
+      "//ui/aura",
       "//ui/aura_extra",
       "//ui/wm",
     ]
@@ -871,19 +783,9 @@ test("content_unittests") {
   if (is_mac && use_openssl) {
     deps += [ "//third_party/boringssl" ]
   }
-
-  if (use_x11) {
-    deps += [ "//ui/gfx/x" ]
-  }
 }
 
 test("content_perftests") {
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   sources = [
     "../browser/renderer_host/input/input_router_impl_perftest.cc",
     "../common/cc_messages_perftest.cc",
@@ -892,7 +794,6 @@ test("content_perftests") {
   deps = [
     "//base/test:test_support",
     "//cc",
-    "//content/browser:for_content_tests",
     "//content/public/browser",
     "//content/public/common",
     "//content/test:test_support",
@@ -909,12 +810,6 @@ test("content_perftests") {
 }
 
 test("content_gl_tests") {
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   sources = [
     "../browser/compositor/gl_helper_unittest.cc",
     "../common/gpu/client/gpu_in_process_context_tests.cc",
@@ -924,13 +819,9 @@ test("content_gl_tests") {
   deps = [
     ":test_support",
     "//base/test:test_support",
-    "//content/browser:for_content_tests",
     "//content/public/common",
     "//gpu/blink",
-    "//gpu/command_buffer/client:gl_in_process_context",
-    "//gpu/command_buffer/client:gles2_implementation",
     "//gpu/command_buffer/common",
-    "//media",
     "//testing/gtest",
     "//third_party/WebKit/public:blink",
     "//ui/base",
@@ -956,12 +847,6 @@ test("content_gl_tests") {
 }
 
 test("content_gl_benchmark") {
-  # See comment at the top of //content/BUILD.gn for why this is disabled in
-  # component builds.
-  if (is_component_build) {
-    check_includes = false
-  }
-
   sources = [
     "../browser/compositor/gl_helper_benchmark.cc",
     "run_gl_benchmark.cc",
@@ -970,11 +855,8 @@ test("content_gl_benchmark") {
   deps = [
     ":test_support",
     "//base/test:test_support",
-    "//content/browser:for_content_tests",
     "//content/public/common",
     "//gpu/blink",
-    "//gpu/command_buffer/client:gl_in_process_context",
-    "//gpu/command_buffer/client:gles2_implementation",
     "//testing/gtest",
     "//third_party/WebKit/public:blink",
     "//ui/base",
diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
index 0ef4261..9aea9db 100644
--- a/content/utility/BUILD.gn
+++ b/content/utility/BUILD.gn
@@ -7,11 +7,8 @@ import("//media/media_options.gni")
 
 source_set("utility") {
   # Only the public target should depend on this. All other targets (even
-  # internal content ones other than test) should depend on the public one.
-  visibility = [
-    ":for_content_tests",
-    "//content/public/utility:utility_sources",
-  ]
+  # internal content ones) should depend on the public one.
+  visibility = [ "//content/public/utility:utility_sources" ]
 
   sources =
       rebase_path(content_utility_gypi_values.utility_sources, ".", "//content")
@@ -20,13 +17,11 @@ source_set("utility") {
 
   deps = [
     "//base",
-    "//components/scheduler",
     "//content:export",
     "//content/public/child:child_sources",
     "//content/public/common:common_sources",
     "//content/public/common:mojo_bindings",
     "//courgette:courgette_lib",
-    "//media/mojo/services:application_factory",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//mojo/shell",
@@ -40,13 +35,3 @@ source_set("utility") {
     deps += [ "//media/mojo/services:application_factory" ]
   }
 }
-
-# See comment at the top of //content/BUILD.gn for how this works.
-group("for_content_tests") {
-  visibility = [ "//content/test/*" ]
-  if (!is_component_build) {
-    public_deps = [
-      ":utility",
-    ]
-  }
-}