Switch mash_browser_tests to Ozone X11 platform.

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index ee3c22722d35e7546858bb24918628655050afd8..43341e8fa857688e0f539d8e5e23206f2b45c64c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1165,22 +1165,6 @@ if (!is_android) {
       ":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") {
@@ -1191,7 +1175,7 @@ static_library("browser_tests_runner") {
     ":test_support",
   ]
 
-  if (is_chromeos) {
+  if (enable_package_mash_services) {
     sources += [
       "base/browser_tests_main_chromeos.cc",
       "base/mash_browser_tests_main.cc",
@@ -5125,7 +5109,24 @@ if (is_android) {
   }
 }
 
-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"