MacViews: Fix GN build

ui/views/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")
 import("//testing/test.gni")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("views.gyp") ],
                           "scope",
                           [ "views.gyp" ])
 
 component("views") {
   sources = gypi_values.views_sources
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   defines = [ "VIEWS_IMPLEMENTATION" ]
 
   deps = [
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
-    "//ui/aura",
     "//ui/native_theme",
     "//ui/resources",
     "//ui/strings",
-    "//ui/wm",
     "//url",
   ]
 
   public_deps = [
     "//base",
     "//ui/accessibility:ax_gen",
     "//ui/base",
     "//ui/base/ime",
     "//ui/compositor",
     "//ui/events",
@@ skipping 48 matching lines @@
     ]
     deps += [
       "//ui/events/devices",
       "//ui/events/platform/x11",
       "//ui/gfx/x",
     ]
   }
 
   if (use_aura) {
     sources += gypi_values.views_aura_sources
+    deps += [
+      "//ui/aura",
+      "//ui/wm",
+    ]
     if (!is_chromeos) {
       sources += gypi_values.views_desktop_aura_sources
       if (use_x11) {
         sources += gypi_values.views_desktop_aura_x11_sources
         configs += [ "//build/config/linux:atk" ]
       } else if (is_win) {
         sources += gypi_values.views_desktop_aura_win_sources
       } else if (use_ozone) {
         sources += gypi_values.views_desktop_aura_ozone_sources
       }
@@ skipping 13 matching lines @@
   sources = gypi_values.views_test_support_sources
 
   public_deps = [
     ":views",
   ]
   deps = [
     "//base",
     "//ipc:test_support",
     "//skia",
     "//testing/gtest",
-    "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
     "//ui/compositor",
     "//ui/compositor:test_support",
     "//ui/events",
     "//ui/events:events_base",
     "//ui/events:test_support",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/wm",
   ]
 
-  if (is_chromeos || !use_x11) {
-    sources -= [
-      "test/ui_controls_factory_desktop_aurax11.cc",
-      "test/ui_controls_factory_desktop_aurax11.h",
-    ]
-  }
   if (use_aura) {
     sources += gypi_values.views_test_support_aura_sources
-    deps += [ "//ui/aura:test_support" ]
+    deps += [
+      "//ui/aura",
+      "//ui/aura:test_support",
+      "//ui/wm",
+    ]
+    if (use_x11 && !is_chromeos) {
+      sources += gypi_values.views_test_support_desktop_aura_x11_sources
+    }
   }
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
   if (use_ozone || !use_x11) {
     sources -= [ "test/x11_property_change_waiter.cc" ]
   }
 }
 
 test("views_unittests") {
   sources = gypi_values.views_unittests_sources
 
   deps = [
     ":test_support",
     "//base",
     "//base:i18n",
     "//base/allocator",
     "//base/test:test_support",
     "//skia",
     "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
-    "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
     "//ui/base:test_support",
     "//ui/compositor:test_support",
     "//ui/events:test_support",
     "//ui/events:events_base",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/resources",
     "//ui/strings",
-    "//ui/wm",
     "//url",
   ]
 
   if (is_win) {
     deps += [
       "//third_party/iaccessible2",
       "//third_party/wtl",
     ]
     libs = [
       "imm32.lib",
@@ skipping 18 matching lines @@
     ]
     deps += [
       "//ui/events/devices",
       "//ui/events/platform/x11",
       "//ui/gfx/x",
     ]
   }
 
   if (use_aura) {
     sources += gypi_values.views_unittests_aura_sources
-    deps += [ "//ui/aura:test_support" ]
+    deps += [
+      "//ui/aura",
+      "//ui/aura:test_support",
+      "//ui/wm",
+    ]
     if (!is_chromeos) {
       sources += gypi_values.views_unittests_desktop_aura_sources
       if (use_x11) {
         sources += gypi_values.views_unittests_desktop_aurax11_sources
       }
     }
   }
   if (!is_chromeos) {
     sources += gypi_values.views_unittests_desktop_sources
   }
@@ skipping 27 matching lines @@
       "run_all_unittests.cc",
       "widget/native_widget_mac_interactive_uitest.mm",
     ]
     deps = [
       ":test_support",
       ":views",
       "//base",
       "//base/test:test_support",
       "//skia",
       "//testing/gtest",
-      "//ui/aura",
       "//ui/compositor",
       "//ui/resources",
       "//ui/resources:ui_test_pak",
       "//ui/strings",
-      "//ui/wm",
     ]
   }
 }