[Service Manager] Get rid of dynamic service discovery

mash/test/mash_unittests.cc

Index: mash/test/mash_unittests.cc
diff --git a/mash/test/mash_unittests.cc b/mash/test/mash_unittests.cc
index 942547556bd892b203d9bf528690cc6d8bb658ba..b5176330b4548548c88d37d953eb0d297e2af674 100644
--- a/mash/test/mash_unittests.cc
+++ b/mash/test/mash_unittests.cc
@@ -3,12 +3,36 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/files/file_path.h"
+#include "base/message_loop/message_loop.h"
 #include "base/test/launcher/unit_test_launcher.h"
+#include "base/threading/thread.h"
 #include "mash/test/mash_test_suite.h"
+#include "mojo/edk/embedder/embedder.h"
+#include "mojo/edk/embedder/scoped_ipc_support.h"
+#include "services/catalog/catalog.h"
 
-int MasterProcessMain(int argc, char** argv) {
+namespace {
+
+const base::FilePath::CharType kCatalogFilename[] =
+    FILE_PATH_LITERAL("mash_unittests_catalog.json");
+
+}  // namespace
+
+int main(int argc, char** argv) {
   mash::test::MashTestSuite test_suite(argc, argv);
 
+  catalog::Catalog::LoadDefaultCatalogManifest(
+      base::FilePath(kCatalogFilename));
+
+  mojo::edk::Init();
+  base::Thread ipc_thread("IPC thread");
+  ipc_thread.StartWithOptions(
+      base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
+  mojo::edk::ScopedIPCSupport ipc_support(
+      ipc_thread.task_runner(),
+      mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN);
+
   return base::LaunchUnitTests(argc, argv,
                                base::Bind(&mash::test::MashTestSuite::Run,
                                           base::Unretained(&test_suite)));