Fix 'gn check' errors in //ui/* targets.

Tested with the following configs:

Linux:
$ gn gen out_gn/Debug
$ gn check out_gn/Debug

Android:
$ gn gen --args='os="android" cpu_arch="arm"' out_gn_android/Debug
$ gn check out_gn_android/Debug

Chromeos:
$ gn gen --args='os="chromeos"' out_gn_chromeos/Debug
$ gn check out_gn_chromeos/Debug

BUG=367595, 376000
TEST=see above
R=brettw@chromium.org
TBR=sky@chromium.org

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

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

.gn

@@ -14,4 +14,4 @@ secondary_source = "//build/secondary/"
 # matching these patterns (see "gn help label_pattern" for format) will have
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
-check_targets = [ "//cc" ]
+check_targets = [ "//cc/*" ]

ui/app_list/BUILD.gn

@@ -243,6 +243,7 @@ test("app_list_unittests") {
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
+    "//ui/events:test_support",
     "//ui/gl",
     "//ui/resources",
     "//ui/resources:ui_test_pak",

ui/app_list/views/app_list_main_view_unittest.cc

@@ -19,7 +19,6 @@
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
-#include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view_model.h"

ui/base/BUILD.gn

@@ -26,7 +26,6 @@ component("base") {
     "accelerators/platform_accelerator.h",
     "accelerators/platform_accelerator_cocoa.h",
     "accelerators/platform_accelerator_cocoa.mm",
-    "android/system_ui_resource_type.h",
     "android/ui_base_jni_registrar.cc",
     "android/ui_base_jni_registrar.h",
     "android/view_android.cc",
@@ -307,6 +306,7 @@ component("base") {
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//base:i18n",
+    "//cc",
     "//net",
     "//third_party/icu",
     "//ui/events",
@@ -425,7 +425,10 @@ component("base") {
     }
 
     if (is_chromeos) {
-      deps += [ "//chromeos" ]
+      deps += [
+        "//chromeos",
+        "//chromeos/ime:gencode",
+      ]
       if (!use_ozone) {
         sources -= [
           "ime/chromeos/ime_keyboard_ozone.cc",
@@ -925,7 +928,10 @@ test("ui_base_unittests") {
   }
 
   if (is_chromeos) {
-    deps += [ "//chromeos" ]
+    deps += [
+      "//chromeos",
+      "//ui/events:dom4_keycode_converter",
+    ]
   }
 }
 # TODO(GYP) Mac (ui_base_tests_bundle)

ui/base/ui_base.gyp

@@ -50,7 +50,6 @@
         'accelerators/platform_accelerator.h',
         'accelerators/platform_accelerator_cocoa.h',
         'accelerators/platform_accelerator_cocoa.mm',
-        'android/system_ui_resource_type.h',
         'android/ui_base_jni_registrar.cc',
         'android/ui_base_jni_registrar.h',
         'android/view_android.cc',

ui/chromeos/BUILD.gn

@@ -38,6 +38,7 @@ component("ui_chromeos") {
     "user_activity_power_manager_notifier.cc",
     "user_activity_power_manager_notifier.h",
   ]
+  defines = [ "UI_CHROMEOS_IMPLEMENTATION" ]
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
@@ -53,10 +54,10 @@ component("ui_chromeos") {
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/message_center",
+    "//ui/native_theme",
     "//ui/views",
     "//ui/wm",
   ]
-  defines = [ "UI_CHROMEOS_IMPLEMENTATION" ]
 }
 
 test("ui_chromeos_unittests") {
@@ -77,6 +78,8 @@ test("ui_chromeos_unittests") {
     "//testing/gtest",
     "//ui/aura:test_support",
     "//ui/compositor",
+    "//ui/events:test_support",
+    "//ui/gl",
     "//ui/message_center",
     "//ui/resources:ui_test_pak",
     "//ui/views",

ui/compositor/BUILD.gn

@@ -115,6 +115,11 @@ source_set("test_support") {
     "//cc",
     "//cc/surfaces",
     "//cc:test_support",
+    "//gpu/command_buffer/client:gl_in_process_context",
+    "//gpu/command_buffer/client:gles2_c_lib",
+    "//gpu/command_buffer/client:gles2_implementation",
+    "//gpu/command_buffer/common:gles2_utils",
+    "//gpu/skia_bindings",
     "//skia",
     "//testing/gtest",
     "//third_party/WebKit/public:blink_minimal",

ui/display/BUILD.gn

@@ -120,6 +120,7 @@ source_set("test_support") {
   ]
   deps = [
     "//base",
+    "//ui/display/types",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
@@ -149,6 +150,7 @@ test("display_unittests") {
     deps += [
       ":display",
       ":test_support",
+      "//base/test:test_support",
       "//ui/display/types",
     ]
   }

ui/gfx/BUILD.gn

@@ -222,6 +222,7 @@ component("gfx") {
 
   deps = [
     ":gfx_export",
+    "//base",
     "//base:i18n",
     "//base:base_static",
     "//base/third_party/dynamic_annotations",

ui/gfx/ipc/BUILD.gn

@@ -17,5 +17,6 @@ component("ipc") {
     "//ipc",
     "//skia",
     "//ui/gfx",
+    "//ui/gfx/geometry",
   ]
 }

ui/snapshot/BUILD.gn

@@ -67,6 +67,7 @@ test("snapshot_unittests") {
     "//skia",
     "//testing/gtest",
     "//ui/base",
+    "//ui/compositor:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",

ui/views_content_client/BUILD.gn

@@ -50,4 +50,11 @@ component("views_content_client") {
 
     deps += [ "//ui/aura" ]
   }
+
+  if (is_chromeos) {
+    deps += [
+      "//ui/aura:test_support",
+      "//ui/wm:test_support",
+    ]
+  }
 }

ui/web_dialogs/BUILD.gn

@@ -23,6 +23,7 @@ component("web_dialogs") {
     "//skia",
     "//ui/base",
     "//url",
+    "//third_party/WebKit/public:blink_minimal",
   ]
 }
 
@@ -41,6 +42,7 @@ static_library("test_support") {
     "//base",
     "//content/public/browser",
     "//skia",
+    "//ui/gfx/geometry",
     "//url",
   ]
 }