Switch mash_browser_tests to Ozone X11 platform.

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/common/features.gni")
@@ skipping 1147 matching lines @@
   }
 
   # TODO(GYP_GONE): Delete this after we've converted everything to GN.
   # The _run targets exist only for compatibility w/ GYP.
   group("tab_capture_end2end_tests_run") {
     testonly = true
     deps = [
       ":browser_tests",
     ]
   }
-
-  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("mash_browser_tests_run") {
-    testonly = true
-    deps = [
-      ":mash_browser_tests",
-    ]
-  }
-
-  group("mash_browser_tests") {
-    testonly = true
-    data_deps = [
-      ":browser_tests",
-    ]
-  }
 }
 
 static_library("browser_tests_runner") {
   testonly = true
   sources = []
 
   deps = [
     ":test_support",
   ]
 
-  if (is_chromeos) {
+  if (enable_package_mash_services) {
     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",
@@ skipping 3913 matching lines @@
   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) {
+if (enable_package_mash_services) {

[fwang, 2017/02/11 10:43:21]

Quick note: This and/or the one above have caused "Failed steps failed
generate_build_files" on the LinuxOS Ozone Bot
(https://build.chromium.org/p/chromium.fyi/builders/Ozone%20Linux/) for which
enable_package_mash_services  = true and is_chromeos = false. At least that one
definitely adds //ash dependencies for LinuxOS, which it should not.

+  # TODO(GYP_GONE): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("mash_browser_tests_run") {
+    testonly = true
+    deps = [
+      ":mash_browser_tests",
+    ]
+  }
+
+  group("mash_browser_tests") {
+    testonly = true
+    data_deps = [
+      ":browser_tests",
+      "//chrome/app/mash:mash_service_overrides",
+    ]
+  }
+
   service_manifest("mash_browser_tests_manifest") {
     name = "mash_browser_tests"
 
     source = "base/mash_browser_tests_manifest.json"
     packaged_services = [
       "//ash/autoclick/mus:manifest",
       "//ash/mus:manifest",
       "//ash/touch_hud/mus:manifest",
       "//mash/catalog_viewer:manifest",
       "//mash/quick_launch:manifest",
@@ skipping 28 matching lines @@
 }
 
 if (is_win) {
   loadable_module("conflicts_dll") {
     testonly = true
     sources = [
       "conflicts/conflicts_dll.cc",
     ]
   }
 }