Clean up unneeded ozone.gni imports

The definitions in ozone.gni were intended to be private to //ui/ozone,
but there's no visibility checking for gni files so there's we've grown
a number of these imports. Remove them where we can easily do so.

Change-Id: Id7e9f924ef3bd7a37f446708e00aac21f51e8f71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2429865Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Michael Spang <spang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810950}

BUILD.gn

@@ -29,7 +29,6 @@ import("//third_party/openh264/openh264_args.gni")
 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
 import("//ui/base/ui_features.gni")
 import("//ui/gl/features.gni")
-import("//ui/ozone/ozone.gni")
 import("//v8/gni/snapshot_toolchain.gni")
 import("//v8/gni/v8.gni")
 
@@ -294,17 +293,12 @@ group("gn_all") {
   if (use_ozone) {
     deps += [
       "//ui/ozone",
-      "//ui/ozone:ozone_unittests",
+      "//ui/ozone:unittests",
       "//ui/ozone/demo",
-      "//ui/ozone/gl:ozone_gl_unittests",
     ]
-
-    if (ozone_platform_x11) {
-      deps += [ "//ui/ozone:ozone_x11_unittests" ]
-    }
   }
 
-  if (use_x11 || ozone_platform_x11) {
+  if (use_x11) {
     deps += [ "//ui/platform_window/x11:x11_unittests" ]
   }
 

chrome/browser/chromeos/BUILD.gn

@@ -11,7 +11,6 @@ import("//printing/buildflags/buildflags.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//third_party/libprotobuf-mutator/fuzzable_proto_library.gni")
 import("//third_party/protobuf/proto_library.gni")
-import("//ui/ozone/ozone.gni")
 
 assert(is_chromeos)
 assert(use_ozone)

chromecast/BUILD.gn

@@ -10,7 +10,6 @@ import("//chromecast/build/tests/cast_test.gni")
 import("//chromecast/chromecast.gni")
 import("//media/media_options.gni")
 import("//tools/grit/repack.gni")
-import("//ui/ozone/ozone.gni")
 import("//v8/gni/v8.gni")
 
 if (chromecast_branding != "public") {

content/gpu/BUILD.gn

@@ -5,7 +5,6 @@
 import("//build/config/ui.gni")
 import("//gpu/vulkan/features.gni")
 import("//media/media_options.gni")
-import("//ui/ozone/ozone.gni")
 
 # This file depends on the legacy global sources assignment filter. It should
 # be converted to check target platform before assigning source files to the

gpu/ipc/common/BUILD.gn

@@ -5,7 +5,6 @@
 import("//build/config/ui.gni")
 import("//gpu/vulkan/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
-import("//ui/ozone/ozone.gni")
 
 group("common") {
   if (is_component_build) {

media/gpu/mac/BUILD.gn

@@ -8,7 +8,6 @@ import("//media/gpu/args.gni")
 import("//media/media_options.gni")
 import("//tools/generate_stubs/rules.gni")
 import("//ui/gl/features.gni")
-import("//ui/ozone/ozone.gni")
 
 assert(is_mac)
 

media/gpu/v4l2/BUILD.gn

@@ -8,7 +8,6 @@ import("//media/gpu/args.gni")
 import("//testing/test.gni")
 import("//tools/generate_stubs/rules.gni")
 import("//ui/gl/features.gni")
-import("//ui/ozone/ozone.gni")
 
 assert(use_v4l2_codec)
 

media/gpu/vaapi/BUILD.gn

@@ -8,7 +8,6 @@ import("//media/gpu/args.gni")
 import("//testing/test.gni")
 import("//tools/generate_stubs/rules.gni")
 import("//ui/gl/features.gni")
-import("//ui/ozone/ozone.gni")
 
 assert(is_linux || is_chromeos)
 assert(use_vaapi)
@@ -173,7 +172,7 @@ source_set("common") {
     "//ui/gfx:memory_buffer",
     "//ui/gl",
   ]
-  if (ozone_platform_drm) {
+  if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 

remoting/host/it2me/BUILD.gn

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//build/config/ui.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_options.gni")
 import("//remoting/remoting_version.gni")
@@ -14,9 +15,6 @@ if (is_mac) {
   import("//build/config/mac/rules.gni")
   import("//third_party/icu/config.gni")
 }
-if (is_chromeos) {
-  import("//ui/ozone/ozone.gni")
-}
 
 # This file depends on the legacy global sources assignment filter. It should
 # be converted to check target platform before assigning source files to the

services/viz/privileged/mojom/compositing/BUILD.gn

@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
-import("//ui/ozone/ozone.gni")
 
 mojom("compositing") {
   sources = [

third_party/blink/public/mojom/BUILD.gn

@@ -2,9 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/ui.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//third_party/blink/public/public_features.gni")
-import("//ui/ozone/ozone.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")

ui/display/util/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//build/config/ui.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
-import("//ui/ozone/ozone.gni")
 
 component("util") {
   output_name = "display_util"

ui/ozone/BUILD.gn

@@ -129,11 +129,11 @@ component("ozone_base") {
     # Everyone should depend on //ui/ozone instead except a handful of
     # things that would otherwise create a cycle.
     "//chromeos/system:system",
+    "//ui/base/ime/chromeos/*",
     "//ui/events/ozone/*",
     "//ui/ozone/common/*",
-    "//ui/ozone/public/mojom",
     "//ui/ozone/platform/*",
-    "//ui/base/ime/chromeos/*",
+    "//ui/ozone/public/mojom",
   ]
 
   configs += [ "//third_party/khronos:khronos_headers" ]
@@ -316,3 +316,21 @@ buildflag_header("buildflags") {
   header = "buildflags.h"
   flags = [ "OZONE_PLATFORM_X11=$ozone_platform_x11" ]
 }
+
+group("unittests") {
+  testonly = true
+
+  visibility += [ "*" ]
+
+  deps = [
+    ":ozone_unittests",
+    "//ui/ozone/gl:ozone_gl_unittests",
+  ]
+
+  if (ozone_platform_x11) {
+    deps += [
+      "//ui/ozone:ozone_x11_unittests",
+      "//ui/platform_window/x11:x11_unittests",
+    ]
+  }
+}

ui/views_content_client/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//ui/ozone/ozone.gni")
 
 # Reset sources_assignment_filter for the BUILD.gn file to prevent
 # regression during the migration of Chromium away from the feature.