Revert of [Service Manager] Get rid of dynamic service discovery

content/test/run_all_unittests.cc

Index: content/test/run_all_unittests.cc
diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc
index e6021647181a5e4baa2b300750a578e92bd6998d..02d678c20d0a7c2b3c6e82529d0d404d95fc7311 100644
--- a/content/test/run_all_unittests.cc
+++ b/content/test/run_all_unittests.cc
@@ -4,29 +4,16 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/files/file_path.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_io_thread.h"
 #include "build/build_config.h"
 #include "content/public/test/unittest_test_suite.h"
 #include "content/test/content_test_suite.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
-#include "services/catalog/catalog.h"
-
-namespace {
-
-const base::FilePath::CharType kCatalogFilename[] =
-    FILE_PATH_LITERAL("content_unittests_catalog.json");
-
-}  // namespace
 
 int main(int argc, char** argv) {
   content::UnitTestTestSuite test_suite(
       new content::ContentTestSuite(argc, argv));
-
-  catalog::Catalog::LoadDefaultCatalogManifest(
-      base::FilePath(kCatalogFilename));
-
   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart);
   mojo::edk::ScopedIPCSupport ipc_support(
       test_io_thread.task_runner(),