Move display_service_unittests to services_unittests.

services/service_manager/public/cpp/test/run_all_service_tests.cc

Index: services/service_manager/public/cpp/test/run_all_service_tests.cc
diff --git a/services/service_manager/public/cpp/test/run_all_service_tests.cc b/services/service_manager/public/cpp/test/run_all_service_tests.cc
index 41e53eb85ec87cdd62456c16684c229be27728f0..f171a8c2cb09471eefac54e707878f00f0909666 100644
--- a/services/service_manager/public/cpp/test/run_all_service_tests.cc
+++ b/services/service_manager/public/cpp/test/run_all_service_tests.cc
@@ -2,50 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/message_loop/message_loop.h"
-#include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "base/threading/thread.h"
-#include "base/values.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"
-
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "mojo/android/system/mojo_jni_registrar.h"
-#endif
-
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-#include "services/service_manager/public/cpp/standalone_service/mach_broker.h"
-#endif
+#include "services/service_manager/public/cpp/test/common_initialization.h"
 
 int main(int argc, char** argv) {
   base::TestSuite test_suite(argc, argv);
 
-  catalog::Catalog::SetDefaultCatalogManifest(
-      service_manager::test::CreateTestCatalog());
-
-  mojo::edk::Init();
-
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-  mojo::edk::SetMachPortProvider(
-      service_manager::MachBroker::GetInstance()->port_provider());
-#endif
-
-#if defined(OS_ANDROID)
-  mojo::android::RegisterSystemJni(base::android::AttachCurrentThread());
-#endif
-
-  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(
+  return service_manager::InitializeAndLaunchUnitTests(
       argc, argv,
       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }