Move display_service_unittests to services_unittests.

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

-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "services/service_manager/public/cpp/test/common_initialization.h"
+
 #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
 
-int main(int argc, char** argv) {
-  base::TestSuite test_suite(argc, argv);
+namespace service_manager {
 
+int InitializeAndLaunchUnitTests(
+    int argc,
+    char** argv,
+    const base::RunTestSuiteCallback& run_test_suite) {
   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(
-      argc, argv,
-      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
+  return base::LaunchUnitTests(argc, argv, run_test_suite);
 }
+
+}  // namespace service_manager