Revert of Make ui gn check pass. Misc GN build improvements.

ui/wm/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.
 
 component("wm") {
   sources = [
     "core/accelerator_delegate.h",
     "core/accelerator_filter.cc",
     "core/accelerator_filter.h",
     "core/base_focus_rules.cc",
@@ skipping 69 matching lines @@
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/events/platform",
     "//ui/events:events_base",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/resources",
   ]
-
-  # http://crbug.com/408650 Circular dependency between this target and Aura.
-  allow_circular_includes_from = [ "//ui/aura" ]
 }
 
 static_library("test_support") {
   sources = [
     "test/wm_test_helper.cc",
     "test/wm_test_helper.h",
   ]
 
   deps = [
     ":wm",
@@ skipping 35 matching lines @@
     "//ui/base",
     "//ui/compositor",
     "//ui/events",
     "//ui/events:events_base",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
   ]
 }