Move display_service_unittests to services_unittests.

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

Index: services/service_manager/public/cpp/test/common_initialization.h
diff --git a/services/service_manager/public/cpp/test/common_initialization.h b/services/service_manager/public/cpp/test/common_initialization.h
new file mode 100644
index 0000000000000000000000000000000000000000..d3fcd539f1c7a122bee70999fb6ecbbae50ef2e4
--- /dev/null
+++ b/services/service_manager/public/cpp/test/common_initialization.h
@@ -0,0 +1,23 @@
+// 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.
+
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_TEST_COMMON_INITIALIZATION_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_TEST_COMMON_INITIALIZATION_H_
+
+#include "base/test/launcher/unit_test_launcher.h"
+
+namespace services {

[Ken Rockot(use gerrit already), 2017/05/25 01:54:00]

For consistency with everything else here this should really be service_manager

+
+// Does common mojo edk/catalog initialization that needs to happen in all
+// service tests. This method exists so that different test runners can use
+// different base::TestSuite instances, but still use the common mojo
+// initialization.
+int InitializeAndLaunchUnitTests(
+    int argc,
+    char** argv,
+    const base::RunTestSuiteCallback& run_test_suite);
+
+}  // namespace services
+
+#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_TEST_COMMON_INITIALIZATION_H_