Revert of Moves ash content specific tests into ash_content_unittests

chrome/test/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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 210 matching lines @@
   }
 
   if (use_ash) {
     sources += [
       "base/default_ash_event_generator_delegate.cc",
       "base/default_ash_event_generator_delegate.h",
     ]
 
     public_deps += [
       "//ash",
-      "//ash:test_support_without_content",
+      "//ash:test_support",
       "//ui/aura",
       "//ui/aura:test_support",
     ]
   }
   if (toolkit_views) {
     public_deps += [ "//ui/views:test_support" ]
   }
 
   if (enable_extensions) {
     public_deps += [
@@ skipping 902 matching lines @@
         "//extensions:chrome_extensions_browsertests",
         "//extensions/common/api",
       ]
     }
 
     if (use_ash) {
       sources +=
           rebase_path(chrome_tests_gypi_values.chrome_browser_tests_ash_sources,
                       ".",
                       "//chrome")
-      deps += [ "//ash:test_support_without_content" ]
+      deps += [ "//ash:test_support" ]
 
       if (enable_app_list) {
         deps += [ ":test_support_applist_ash" ]
       }
     }
     if (use_aura || toolkit_views) {
       deps += [ "//ui/events:test_support" ]
     }
     if (toolkit_views) {
       sources += rebase_path(
@@ skipping 788 matching lines @@
               ".",
               "//chrome")
     }
   }
   if (use_ash) {
     sources +=
         rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources,
                     ".",
                     "//chrome")
     deps += [
-      "//ash:test_support_with_content",
+      "//ash:test_support",
       "//ash/common/strings",
       "//ash/resources",
     ]
 
     # We eventually want to compile both in Win Aura builds, see
     # http://crbug.com/155545.
     if (!is_win) {
       sources -= [ "../browser/ui/window_sizer/window_sizer_unittest.cc" ]
     }
   }
@@ skipping 125 matching lines @@
   }
   if (is_chromeos) {
     deps += [
       "//chrome/browser/chromeos:unit_tests",
       "//chromeos/ime:gencode",
     ]
     sources -= [
       "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
       "../browser/signin/signin_manager_unittest.cc",
     ]
-    sources += [
-      "base/ash_test_environment_chrome.cc",
-      "base/ash_test_environment_chrome.h",
-    ]
   }
   if (use_x11) {
     deps += [ "//ui/events/devices" ]
     data_deps += [ "//tools/xdisplaycheck" ]
   } else {
     sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
   }
   if (use_gnome_keyring && current_cpu == "x64") {
     # Only add this test for 64 bit builds because otherwise we need the 32
     # bit library on 64 bit systems when running this test.
@@ skipping 380 matching lines @@
       "touch_hud",
       "ui",
     ]
 
     if (is_linux && !is_android) {
       deps += [ "//components/font_service:manifest" ]
       packaged_services += [ "font_service" ]
     }
   }
 }