Run Ozone CrOS tests with X11 platform by default.

testing/buildbot/chromium.chromiumos.json

Index: testing/buildbot/chromium.chromiumos.json
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 3285752817f5f40ed06f5c01e2ead0711b8f450f..f470f9452d7b7eb20a99379e1aff458942ef9469 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -37,33 +37,27 @@
         "test": "app_shell_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "ash_content_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "ash_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "aura_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -71,6 +65,7 @@
       },
       {
         "args": [
+          "--ozone-platform=headless",
           "--override-use-gl-with-osmesa-for-tests",
           "--run-in-mash",
           "--service-overrides=src/chrome/app/mash/mash_service_overrides.json",
@@ -85,18 +80,12 @@
         "test": "browser_tests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "cacheinvalidation_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -109,6 +98,9 @@
         "test": "chromeos_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -134,18 +126,12 @@
         "test": "content_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "crypto_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -158,18 +144,12 @@
         "test": "display_service_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "display_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -188,18 +168,12 @@
         "test": "extensions_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "gcm_unit_tests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -209,15 +183,6 @@
         "swarming": {
           "can_use_on_swarming_builders": true
         },
-        "test": "gl_unittests"
-      },
-      {
-        "args": [
-          "--ozone-platform=x11"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
         "test": "gl_unittests_ozone"
       },
       {
@@ -227,21 +192,24 @@
         "test": "google_apis_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "gpu_ipc_service_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "gpu_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -261,27 +229,18 @@
         "test": "ipc_tests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "jingle_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "mash_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -294,9 +253,6 @@
         "test": "media_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -309,15 +265,15 @@
         "test": "midi_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "mus_demo_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -336,9 +292,6 @@
         "test": "nacl_loader_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -351,24 +304,21 @@
         "test": "net_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "ozone_gl_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "ozone_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -393,45 +343,30 @@
         "test": "remoting_unittests"
       },
       {
-        "args": [
-          "--test-launcher-print-test-stdio=always"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "sandbox_linux_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "service_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "skia_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "sql_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -444,9 +379,6 @@
         "test": "ui_arc_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -459,24 +391,21 @@
         "test": "ui_chromeos_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "ui_struct_traits_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
         "test": "ui_touch_selection_unittests"
       },
       {
+        "args": [
+          "--ozone-platform=headless"
+        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },
@@ -489,9 +418,6 @@
         "test": "url_unittests"
       },
       {
-        "args": [
-          "--override-use-gl-with-osmesa-for-tests"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": false
         },
@@ -504,9 +430,6 @@
         "test": "views_mus_unittests"
       },
       {
-        "args": [
-          "--ozone-platform=x11"
-        ],
         "swarming": {
           "can_use_on_swarming_builders": true
         },