Revert of Moves ash content specific tests into ash_content_unittests

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ad3a109da2286963b6660c91137de9343b76d24f..dcadd5c129444736a01e4d563ad6fddcf2d7d4a2 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -228,7 +228,7 @@
 
     public_deps += [
       "//ash",
-      "//ash:test_support_without_content",
+      "//ash:test_support",
       "//ui/aura",
       "//ui/aura:test_support",
     ]
@@ -1151,7 +1151,7 @@
           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" ]
@@ -1960,7 +1960,7 @@
                     ".",
                     "//chrome")
     deps += [
-      "//ash:test_support_with_content",
+      "//ash:test_support",
       "//ash/common/strings",
       "//ash/resources",
     ]
@@ -2105,10 +2105,6 @@
     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) {