Misc service_manager and service test cleanup

services/test/run_all_unittests.cc

Index: services/test/run_all_unittests.cc
diff --git a/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc b/services/test/run_all_unittests.cc
similarity index 81%
rename from services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
rename to services/test/run_all_unittests.cc
index 8d02f3fe4471b440d6bb24c8b122d549cb6d6221..9822c388e8440f18c25b30eb5671a0ba92307f6a 100644
--- a/services/service_manager/public/cpp/test/run_all_service_tests_with_catalog.cc
+++ b/services/test/run_all_unittests.cc
@@ -8,15 +8,10 @@
 #include "base/threading/thread.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
-#include "services/catalog/catalog.h"
-#include "services/service_manager/public/cpp/test/service_test_catalog.h"
 
 int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);
 
-  catalog::Catalog::SetDefaultCatalogManifest(
-      service_manager::test::CreateTestCatalog());
-
   mojo::edk::Init();
 
   base::Thread ipc_thread("IPC thread");