Make ui gn check pass. Misc GN build improvements.

ui/keyboard/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("//tools/grit/grit_rule.gni")
 
 component("keyboard") {
   sources = [
     "keyboard.cc",
     "keyboard.h",
@@ skipping 23 matching lines @@
     "//url",
     "//ui/aura",
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/keyboard/webui",
     "//ui/wm",
   ]
+
+  # http://crbug.com/408651 Include cycle between this target and the "webui"
+  # sub-target.
+  allow_circular_includes_from = [ "//ui/keyboard/webui" ]
 }
 
 grit("resources_grit") {
   source = "keyboard_resources.grd"
   outputs = [
     "grit/keyboard_resources.h",
     "grit/keyboard_resources_map.h",
     "keyboard_resources.pak",
     "keyboard_resources.rc",
   ]
@@ skipping 36 matching lines @@
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/resources:ui_test_pak",
     "//ui/wm",
     "//url",
   ]
 }