Fix ash 'gn check' errors; whitelist target.

BUG=NONE
TEST='gn check out/<DIR> ash' passes; ash target builds/runs as expected.
R=sky@chromium.org
TBR=ben@chromium.org

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

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

6 files changed, 66 insertions, 6 deletions

diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index e6ecc72..a11f7f0 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -45,6 +45,7 @@ component("ash") {
     "//ui/base:ui_data_pack",
     "//ui/base/ime",
     "//ui/compositor",
+    "//ui/display/types",
     "//ui/events",
     "//ui/events:events_base",
     "//ui/events:gesture_detection",
@@ -53,6 +54,8 @@ component("ash") {
     "//ui/gfx/geometry",
     "//ui/keyboard",
     "//ui/message_center",
+    "//ui/native_theme",
+    "//ui/platform_window",
     "//ui/platform_window/stub",
     "//ui/resources",
     "//ui/strings",
@@ -91,6 +94,7 @@ component("ash") {
 
   if (use_ozone) {
     deps += [
+      "//ui/events:dom_keycode_converter",
       "//ui/events/ozone:events_ozone",
       "//ui/ozone",
     ]
@@ -101,6 +105,9 @@ component("ash") {
       "//chromeos",
       "//chromeos:power_manager_proto",
       "//device/bluetooth",
+
+      # TODO(msw): Remove this; only ash_with_content should depend on webkit.
+      "//third_party/WebKit/public:blink_headers",
       "//third_party/qcms",
       "//ui/chromeos:ui_chromeos",
       "//ui/chromeos/resources",
@@ -150,6 +157,7 @@ component("ash_with_content") {
     "//base",
     "//base/third_party/dynamic_annotations",
     "//content/public/browser",
+    "//gpu/config",
     "//ipc",
     "//skia",
     "//ui/aura",
@@ -168,6 +176,7 @@ component("ash_with_content") {
   ]
 }
 
+# TODO(msw): Move support code with content deps to test_support_with_content.
 source_set("test_support") {
   testonly = true
   sources = gypi_values.ash_test_support_sources
@@ -179,25 +188,48 @@ source_set("test_support") {
   deps = [
     ":test_support_with_content",  # TODO(beng): reverse this direction.
     "//ash/resources",
+    "//base:i18n",
+    "//base/test:test_support",
     "//components/signin/core/account_id",
+    "//components/user_manager:user_manager",
+    "//content/public/browser",
+    "//content/test:test_support",
+    "//device/bluetooth",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
     "//ui/app_list",
     "//ui/app_list:test_support",
+    "//ui/aura",
+    "//ui/aura:test_support",
+    "//ui/base:test_support",
+    "//ui/compositor:test_support",
+    "//ui/display/types",
     "//ui/events:events_base",
+    "//ui/events:test_support",
     "//ui/events/devices",
     "//ui/gl",
+    "//ui/gl:test_support",
+    "//ui/keyboard",
+    "//ui/message_center",
     "//ui/views",
     "//ui/views:test_support",
+    "//ui/wm",
   ]
 
   if (is_win) {
     deps += [ "//ui/platform_window/win" ]
   }
 
+  if (use_x11) {
+    deps += [ "//ui/gfx/x" ]
+  }
+
   if (is_chromeos) {
-    deps += [ "//ui/display" ]
+    deps += [
+      "//chromeos",
+      "//ui/display",
+    ]
   }
 }
 
@@ -227,8 +259,12 @@ source_set("interactive_ui_test_support") {
   deps = [
     ":ash",
     ":test_support",
+    "//base",
     "//skia",
     "//testing/gtest",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/gl:test_support",
   ]
 }
 
@@ -244,6 +280,7 @@ static_library("ash_shell_lib") {
     "//ash/strings",
     "//base",
     "//base:i18n",
+    "//components/user_manager",
     "//net",
     "//skia",
     "//third_party/icu",
@@ -264,6 +301,7 @@ static_library("ash_shell_lib") {
     "//ui/views:test_support",
     "//ui/views/examples:views_examples_lib",
     "//ui/views/examples:views_examples_with_content_lib",
+    "//ui/wm",
   ]
 }
 
@@ -273,11 +311,26 @@ static_library("ash_shell_lib_with_content") {
 
   deps = [
     ":ash_shell_lib",
+    ":ash_with_content",
+    "//base:i18n",
     "//chrome:packed_resources",
     "//content",
     "//content/shell:content_shell_lib",
+    "//device/bluetooth",
+    "//net",
     "//skia",
+    "//ui/aura",
+    "//ui/base",
+    "//ui/compositor",
+    "//ui/events/devices",
+    "//ui/message_center",
+    "//ui/views:test_support",
+    "//ui/wm",
   ]
+
+  if (is_chromeos) {
+    deps += [ "//chromeos" ]
+  }
 }
 
 test("ash_unittests") {
@@ -288,6 +341,7 @@ test("ash_unittests") {
     ":ash",
     ":ash_with_content",
     ":test_support",
+    ":test_support_with_content",
     "//ash/resources",
     "//ash/strings",
     "//base",
@@ -300,6 +354,7 @@ test("ash_unittests") {
     "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
+    "//ui/app_list",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base",
@@ -307,6 +362,7 @@ test("ash_unittests") {
     "//ui/base/ime",
     "//ui/compositor",
     "//ui/compositor:test_support",
+    "//ui/display/types",
     "//ui/events",
     "//ui/events:gesture_detection",
     "//ui/events:test_support",
@@ -365,13 +421,14 @@ test("ash_unittests") {
   if (is_chromeos) {
     sources += [ "first_run/first_run_helper_unittest.cc" ]
     deps += [
+      "//chromeos",
       "//chromeos:power_manager_proto",
       "//chromeos:test_support_without_gmock",
       "//device/bluetooth",
+      "//ui/chromeos:ui_chromeos",
       "//ui/display",
       "//ui/display:test_support",
       "//ui/display:test_util",
-      "//ui/display/types",
     ]
   } else {
     sources -= [
@@ -399,8 +456,11 @@ executable("ash_shell_with_content") {
 
   deps = [
     ":ash_shell_lib_with_content",
+    "//base",
     "//build/config/sanitizers:deps",
     "//components/user_manager",
+    "//content",
+    "//content/public/app:both",
   ]
 
   if (is_win) {
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index dc48523..2728797 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -58,6 +58,7 @@
 #include "base/command_line.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
+#include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/base/accelerators/accelerator.h"
@@ -73,7 +74,6 @@
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notifier_settings.h"
-#include "ui/views/controls/webview/webview.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/display_configuration_controller.h"
diff --git a/ash/mus/BUILD.gn b/ash/mus/BUILD.gn
index 457bee7..61ed9bc 100644
--- a/ash/mus/BUILD.gn
+++ b/ash/mus/BUILD.gn
@@ -21,6 +21,8 @@ source_set("lib") {
 
   deps = [
     "//ash",
+    "//cc",
+    "//cc/surfaces",
     "//components/mus/common",
     "//components/mus/public/cpp",
     "//components/mus/public/interfaces",
@@ -61,5 +63,6 @@ mojo_native_application("mus") {
   ]
   deps = [
     ":lib",
+    "//mojo/shell/public/cpp",
   ]
 }
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index c750ae4..a53be83 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -11,7 +11,6 @@
 #include "ash/media_delegate.h"
 #include "ash/new_window_delegate.h"
 #include "ash/session/session_state_delegate.h"
-#include "ash/shell/content/shell_content_state_impl.h"
 #include "ash/shell/context_menu.h"
 #include "ash/shell/example_factory.h"
 #include "ash/shell/shelf_delegate_impl.h"
diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc
index 284e09f..782ebf2 100644
--- a/ash/system/chromeos/power/power_event_observer.cc
+++ b/ash/system/chromeos/power/power_event_observer.cc
@@ -9,7 +9,6 @@
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/wm/power_button_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "components/prefs/pref_service.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/user_activity/user_activity_detector.h"
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 6805926..296923f 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -41,7 +41,6 @@
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "ui/platform_window/win/win_window.h"
-#include "win8/test/test_registrar_constants.h"
 #endif
 
 #if defined(USE_X11)