Changes around how browser_tests are launched for mash

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")
 import("//chrome/common/features.gni")
 import("//chrome/test/base/js2gtest.gni")
 import("//components/os_crypt/features.gni")
+import("//services/shell/public/service_manifest.gni")
 import("//testing/test.gni")
 import("//v8/gni/v8.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 # This target exists to reference other test executables to bring these files
 # into the build.
 group("test") {
@@ skipping 826 matching lines @@
       "//testing/buildbot/filters/mojo.fyi.browser_tests.filter",
     ]
     data_deps = [
       ":browser_tests",
     ]
   }
 }
 
 static_library("browser_tests_runner") {
   testonly = true
-  sources = [
-    "base/browser_tests_main.cc",
-  ]
+  sources = []
 
   deps = [
     ":test_support",
   ]
 
-  if (use_aura) {
+  if (is_chromeos) {
     sources += [
+      "base/browser_tests_main_chromeos.cc",
       "base/mash_browser_tests_main.cc",
       "base/mash_browser_tests_main.h",
       "base/mojo_test_connector.cc",
       "base/mojo_test_connector.h",
     ]
 
     deps += [
+      "//mash/package",
       "//services/shell/background:lib",
       "//services/shell/background/tests:test_support",
     ]
 
     data_deps = [
+      ":mash_browser_tests_manifest",
       "//chrome/app:mojo_manifests",
       "//mash/session",
     ]
+  } else {
+    sources += [ "base/browser_tests_main.cc" ]
   }
 }
 
 test("browser_tests") {
   sources = rebase_path(chrome_tests_gypi_values.chrome_browser_tests_sources,
                         ".",
                         "//chrome")
 
   configs += [
     "//build/config:precompiled_headers",
@@ skipping 1568 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     java_files = [ "android/unit_tests_apk/src/org/chromium/chrome/unit_tests_apk/ChromeNativeTestApplication.java" ]
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }
+
+if (is_chromeos) {
+  service_manifest("mash_browser_tests_manifest") {
+    type = "exe"
+    name = "mash_browser_tests"
+
+    source = "base/mash_browser_tests_manifest.json"
+    deps = [
+      "//ash/mus:manifest",
+      "//ash/touch_hud/mus:manifest",
+      "//mash/app_driver:manifest",
+      "//mash/quick_launch:manifest",
+      "//mash/session:manifest",
+      "//mash/task_viewer:manifest",
+      "//services/ui:manifest",
+    ]
+    packaged_services = [
+      "app_driver",
+      "ash",
+      "mash_session",
+      "quick_launch",
+      "task_viewer",
+      "touch_hud",
+      "ui",
+    ]
+
+    if (is_linux && !is_android) {
+      deps += [ "//components/font_service:manifest" ]
+      packaged_services += [ "font_service" ]
+    }
+  }
+}