Miscellaneous GN updates.

ash/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("ash.gyp") ],
     "scope",
     [ "ash.gyp" ])
 
 component("ash") {
   sources = gypi_values.ash_sources
 
   defines = [ "ASH_IMPLEMENTATION" ]
 
   deps = [
     "//ash/resources",
     "//ash/strings",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//cc",
+    "//components/user_manager",
     "//content/public/browser",
     "//media",
     "//net",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/app_list",
     "//ui/aura",
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/events:events_base",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/keyboard",
     "//ui/message_center",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
     "//ui/views/controls/webview",
     "//ui/web_dialogs",
     "//ui/wm",
     "//url",
-    #'../components/components.gyp:user_manager',  TODO(GYP)
   ]
 
   forward_dependent_configs_from = [
     "//ash/resources",
     "//ash/strings",
   ]
 
   if (is_win) {
     sources -= [
       "sticky_keys/sticky_keys_controller.cc",
@@ skipping 85 matching lines @@
     "//ipc",
     "//skia",
     "//ui/aura",
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/resources",
     "//ui/strings",
+    "//ui/views",
+    "//ui/views/controls/webview",
     "//ui/web_dialogs",
     "//url",
-    #'../ui/views/controls/webview/webview.gyp:webview',  TODO(GYP)
-    #'../ui/views/views.gyp:views',  TODO(GYP)
   ]
 
   forward_dependent_configs_from = [
     ":ash",
   ]
 }
 
 static_library("test_support") {
   sources = gypi_values.ash_test_support_sources
 
@@ skipping 28 matching lines @@
   deps = [
     ":ash",
     ":ash_with_content",
     ":test_support",
     "//ash/resources",
     "//ash/strings",
     "//base",
     "//base:i18n",
     #"//chrome:packed_resources",  TODO(GYP)
     "//content",
+    "//content/shell:content_shell_lib",
     "//skia",
     "//third_party/icu",
     "//ui/app_list",
     "//ui/aura",
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/keyboard",
     "//ui/message_center",
     "//ui/resources",
     "//ui/views",
     "//ui/views:test_support",
-    #'../content/content_shell_and_tests.gyp:content_shell_lib',  TODO(GYP)
     #'../ui/views/examples/examples.gyp:views_examples_lib',  TODO(GYP)
     #'../ui/views/examples/examples.gyp:views_examples_with_content_lib',  TODO(GYP)
   ]
 }
 
 if (false) {  # TODO(GYP) enable ash shell and unit tests when they link.
 
 test("ash_unittests") {
   sources = gypi_values.ash_unittests_sources
 
   deps = [
     ":ash",
     ":ash_with_content",
     ":test_support",
     "//ash/resources",
     "//ash/strings",
     "//base",
     "//base/allocator",
     "//base/test:test_support",
+    "//components/user_manager",
     "//content/public/browser",
+    "//content/test:test_support",
     "//skia",
     "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base",
     "//ui/base:test_support",
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/events",
     "//ui/events:test_support",
     "//ui/events:gesture_detection",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/keyboard",
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/resources",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/views/controls/webview:test_support",
     "//ui/web_dialogs",
     "//ui/wm",
     "//url",
-    #'../components/components.gyp:user_manager',  TODO(GYP)
-    #'../content/content_shell_and_tests.gyp:test_support_content',  TODO(GYP)
   ]
 
   if (!is_chromeos) {
     sources -= [
       # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
       "focus_cycler_unittest.cc",
       # All tests for multiple displays: not supported on Windows Ash.
       "accelerators/nested_dispatcher_controller_unittest.cc",
       "wm/drag_window_resizer_unittest.cc",
       # Can't resize on Windows Ash. http://crbug.com/165962
       "ash_root_window_transformer_unittest.cc",
       "magnifier/magnification_controller_unittest.cc",
       "wm/workspace/workspace_window_resizer_unittest.cc",
       "sticky_keys/sticky_keys_overlay_unittest.cc",
       "sticky_keys/sticky_keys_unittest.cc",
       "system/tray/media_security/multi_profile_media_tray_item_unittest.cc",
       "autoclick/autoclick_unittest.cc",
     ]
-    source += [
+    sources += [
       #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',  TODO(GYP)
     ]
   }
 
   if (is_win) {
     cflags = [ "/wd4267" ]
   }
 
   if (!use_x11) {
     sources -= [
@@ skipping 30 matching lines @@
   }
 }
 
 executable("ash_shell") {
   sources = [
     "shell/shell_main.cc",
   ]
 
   deps = [
     ":ash_shell_lib",
-    #'../components/components.gyp:user_manager',  TODO(GYP)
+    "//components/user_manager",
   ]
 
   if (is_win) {
     configs -= [ "//build/config/win:console" ]
     configs += [ "//build/config/win:windowed" ]
     deps += [
       "//sandbox",
     ]
   }
 
   if (is_chromeos) {
     deps += [
       "../device/bluetooth/bluetooth.gyp:device_bluetooth",
     ]
   }
 }
 
 test("ash_shell_unittests") {
   sources = [
     "shell/window_watcher_unittest.cc",
     "test/ash_unittests.cc",
   ]
 
   deps = [
     "//base/test:test_support",
+    "//components/user_manager",
+    "//content/test:test_support",
     "//skia",
     "//testing/gtest",
     "//ui/aaccessibility",
-    #'../components/components.gyp:user_manager',  TODO(GYP)
-    #'../content/content_shell_and_tests.gyp:test_support_content',  TODO(GYP)
   ]
 
   if (is_chromeos) {
     deps += [ "//ui/display" ]
   }
 }
 
 }  # if false