Add a catalog to content_browsertests

The catalog includes test_ws as standalone service so that
ServiceManager could launch it with --enable-features=Mash and
--enable-service-binary-launcher;

Bug: 866942
Change-Id: I898aa4644b0bf4307c667afdf4959d9f9c829d2b
Reviewed-on: https://chromium-review.googlesource.com/1164079Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581351}

content/test/BUILD.gn

@@ -524,6 +524,7 @@ jumbo_static_library("browsertest_support") {
     "//gin",
     "//media",
     "//net",
+    "//services/catalog:lib",
     "//skia",
     "//testing/gtest",
     "//ui/accessibility:ax_enums_mojo",
@@ -537,6 +538,10 @@ jumbo_static_library("browsertest_support") {
     deps += [ "//content/public/browser" ]
   }
 
+  if (is_chromeos) {
+    deps += [ ":content_browsertests_catalog_source" ]
+  }
+
   if (use_aura && toolkit_views) {
     deps += [ "//ui/views" ]
   }
@@ -1137,6 +1142,7 @@ test("content_browsertests") {
 
   if (is_chromeos) {
     deps += [ "//chromeos" ]
+    data_deps += [ "//services/ui/test_ws" ]
   }
 
   if (use_aura && !is_win) {
@@ -1220,6 +1226,21 @@ test("content_browsertests") {
   }
 }
 
+if (is_chromeos) {
+  catalog("content_browsertests_catalog") {
+    testonly = true
+
+    standalone_services = [ "//services/ui/test_ws:manifest" ]
+  }
+
+  catalog_cpp_source("content_browsertests_catalog_source") {
+    testonly = true
+
+    catalog = ":content_browsertests_catalog"
+    generated_function_name = "content::CreateContentBrowserTestsCatalog"
+  }
+}
+
 test("content_unittests") {
   # See comment at the top of //content/BUILD.gn for why this is disabled in
   # component builds.

content/test/content_test_launcher.cc

@@ -21,6 +21,7 @@
 #include "content/shell/app/shell_main_delegate.h"
 #include "content/shell/common/shell_switches.h"
 #include "media/base/media_switches.h"
+#include "services/catalog/catalog.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_features.h"
@@ -40,6 +41,10 @@
 #include "ui/base/ui_base_paths.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "content/test/content_browsertests_catalog_source.h"
+#endif
+
 namespace content {
 
 #if defined(OS_ANDROID)
@@ -88,6 +93,11 @@ class ContentBrowserTestSuite : public ContentTestSuiteBase {
     InitializeMojo();
 #endif
 
+#if defined(OS_CHROMEOS)
+    catalog::Catalog::SetDefaultCatalogManifest(
+        content::CreateContentBrowserTestsCatalog());
+#endif
+
     ContentTestSuiteBase::Initialize();
   }