Run weblayer_browsertests on Mojo Linux & Mojo Windows bots.

Change-Id: Ie4236b7e6e925cb7ef7272678c9824f7ec07eca1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1811970
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#698260}

testing/buildbot/chromium.fyi.json

@@ -838,6 +838,22 @@
           "shards": 2
         },
         "test": "content_browsertests"
+      },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "weblayer_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "os": "Ubuntu-16.04"
+            }
+          ]
+        },
+        "test": "weblayer_browsertests"
       }
     ]
   },
@@ -897,6 +913,17 @@
           "can_use_on_swarming_builders": true
         },
         "test": "services_unittests"
+      },
+      {
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_gtest_merge.py"
+        },
+        "name": "weblayer_browsertests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "weblayer_browsertests"
       }
     ]
   },

testing/buildbot/gn_isolate_map.pyl

@@ -2982,6 +2982,10 @@
     "label": "//services/device/usb:webusb_descriptors_fuzzer",
     "type": "fuzzer",
   },
+  "weblayer_browsertests": {
+    "label": "//weblayer/test:weblayer_browsertests",
+    "type": "windowed_test_launcher",
+  },
   "webview_cts_tests": {
     "args": [
       "--logdog-bin-cmd",

testing/buildbot/test_suites.pyl

@@ -4346,6 +4346,9 @@
         },
         'test': 'browser_tests',
       },
+      'weblayer_browsertests': {
+        'test': 'weblayer_browsertests',
+      },
     },
 
     'network_service_gtests': {

weblayer/test/BUILD.gn

@@ -10,13 +10,16 @@ import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 
 test("weblayer_browsertests") {
   data = [
+    "$root_out_dir/weblayer_shell.pak",
+    "data/",
     "//net/tools/testserver/",
     "//third_party/pywebsocket/src/mod_pywebsocket/",
     "//third_party/tlslite/",
   ]
 
   data_deps = [
     "//third_party/mesa_headers",
+    "//weblayer/shell:pak",
   ]
 
   defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ]

weblayer/test/weblayer_browser_test.cc

@@ -27,6 +27,8 @@ void WebLayerBrowserTest::PreRunTestOnMainThread() {
   shell_ = Shell::windows()[0];
 }
 
-void WebLayerBrowserTest::PostRunTestOnMainThread() {}
+void WebLayerBrowserTest::PostRunTestOnMainThread() {
+  Shell::CloseAllWindows();
+}
 
 }  // namespace weblayer