chromeos: Makes AshTestBase/Helper target mash when appropriate

mash/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/nacl/config.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 # Target that builders build.
@@ skipping 96 matching lines @@
 
 if (is_chromeos) {
   # TODO(jamescook): Move these tests into //ash/mus.
   test("mash_unittests") {
     sources = [
       "test/mash_test_suite.cc",
       "test/mash_test_suite.h",
       "test/mash_unittests.cc",
     ]
     deps = [
-      "//ash/common:unittests",
-      "//ash/common/test:test_support",
+      "//ash:common_unittests",
       "//ash/mus:resources",
       "//ash/mus:unittests",
       "//base",
       "//base/test:test_support",
       "//cc",
       "//cc:test_support",
       "//mojo/edk/system",
       "//services/catalog:lib",
       "//ui/aura",
       "//ui/base",
@@ skipping 23 matching lines @@
     testonly = true
     sources = get_target_outputs(":mash_unittests_catalog")
     outputs = [
       "${root_out_dir}/mash_unittests_catalog.json",
     ]
     deps = [
       ":mash_unittests_catalog",
     ]
   }
 }