Revert of Moves ash content specific tests into ash_content_unittests

components/exo/BUILD.gn

 # Copyright 2015 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/ui.gni")
 import("//testing/test.gni")
 
 source_set("exo") {
   sources = [
     "buffer.cc",
@@ skipping 59 matching lines @@
 
   sources = [
     "test/exo_test_base.cc",
     "test/exo_test_base.h",
     "test/exo_test_helper.cc",
     "test/exo_test_helper.h",
   ]
 
   deps = [
     ":exo",
-    "//ash:test_support_without_content",
+    "//ash:test_support",
     "//base",
     "//gpu",
     "//skia",
     "//testing/gtest",
     "//ui/aura",
     "//ui/compositor",
     "//ui/gfx/geometry",
     "//ui/wm:wm",
   ]
 }
@@ skipping 43 matching lines @@
   }
 }
 
 test("exo_unittests") {
   sources = [
     "test/run_all_unittests.cc",
   ]
 
   deps = [
     ":unit_tests",
-    "//ash:test_support_without_content",
+    "//ash:test_support",
     "//base",
     "//base/test:test_support",
     "//device/gamepad:test_helpers",
   ]
 
   data_deps = [
     "//ash/common/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 
   if (use_x11) {
     deps += [ "//tools/xdisplaycheck" ]
   }
 
   if (is_linux) {
     deps += [ "//components/exo/wayland:unit_tests" ]
   }
 }