[service-manager] Delete the ServiceTest framework

This deletes all code supporting the deprecated ServiceTest framework and also cleans up a bunch of superfluous dependencies on service stuff around the tree. TBR=sky@chromium.org Bug: 906239 Change-Id: I56db6c5a4c1d0ffab1be5dde08692383c424d5b6 Reviewed-on: https://chromium-review.googlesource.com/c/1354507 Commit-Queue: Ken Rockot <rockot@google.com> Reviewed-by: Oksana Zhuravlova <oksamyt@chromium.org> Cr-Commit-Position: refs/heads/master@{#612389}
Denger-Network · Nov 29, 2018 · ea36de2 · ea36de2
1 parent d496fcb
commit ea36de2
Show file tree

Hide file tree

Showing 60 changed files with 159 additions and 619 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -1953,7 +1953,6 @@ test("ash_unittests") {
     "//services/catalog:lib",
     "//services/media_session/public/cpp/test:test_support",
     "//services/media_session/public/mojom",
-    "//services/service_manager/public/cpp:service_test_support",
     "//services/ws:test_support",
     "//services/ws/public/cpp/input_devices:test_support",
     "//services/ws/public/mojom",

diff --git a/chrome/services/app_service/BUILD.gn b/chrome/services/app_service/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/cups_ipp_parser/BUILD.gn b/chrome/services/cups_ipp_parser/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/file_util/BUILD.gn b/chrome/services/file_util/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/isolated_xr_device/BUILD.gn b/chrome/services/isolated_xr_device/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/media_gallery_util/BUILD.gn b/chrome/services/media_gallery_util/BUILD.gn
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//media/media_options.gni")
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/printing/BUILD.gn b/chrome/services/printing/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/util_win/BUILD.gn b/chrome/services/util_win/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chrome/services/wifi_util_win/BUILD.gn b/chrome/services/wifi_util_win/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/chromeos/services/device_sync/BUILD.gn b/chromeos/services/device_sync/BUILD.gn
@@ -2,9 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/service_manager/public/tools/test/service_test.gni")
 
 assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
 
@@ -92,7 +90,6 @@ source_set("unit_tests") {
     "//components/prefs:test_support",
     "//services/identity/public/cpp:test_support",
     "//services/network:test_support",
-    "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:test_support",
     "//testing/gtest",
   ]

diff --git a/chromeos/services/device_sync/public/cpp/BUILD.gn b/chromeos/services/device_sync/public/cpp/BUILD.gn
@@ -59,7 +59,6 @@ source_set("unit_tests") {
     "//net",
     "//services/identity/public/cpp:test_support",
     "//services/network:test_support",
-    "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:test_support",
     "//testing/gtest",
   ]

diff --git a/chromeos/services/multidevice_setup/BUILD.gn b/chromeos/services/multidevice_setup/BUILD.gn
@@ -2,9 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/service_manager/public/tools/test/service_test.gni")
 
 assert(is_chromeos, "Non-ChromeOS builds cannot depend on //chromeos")
 

diff --git a/chromeos/services/multidevice_setup/public/cpp/BUILD.gn b/chromeos/services/multidevice_setup/public/cpp/BUILD.gn
@@ -151,7 +151,6 @@ source_set("unit_tests") {
     "//chromeos/services/multidevice_setup/public/mojom",
     "//components/cryptauth",
     "//components/cryptauth:test_support",
-    "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:test_support",
     "//testing/gtest",
   ]

diff --git a/chromeos/services/secure_channel/public/cpp/client/BUILD.gn b/chromeos/services/secure_channel/public/cpp/client/BUILD.gn
@@ -69,7 +69,6 @@ source_set("unit_tests") {
     "//chromeos/services/secure_channel/public/mojom",
     "//components/cryptauth",
     "//components/cryptauth:test_support",
-    "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:test_support",
     "//testing/gtest",
   ]

diff --git a/components/mirroring/service/BUILD.gn b/components/mirroring/service/BUILD.gn
@@ -2,10 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/catalog/public/tools/catalog.gni")
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/service_manager/public/tools/test/service_test.gni")
 import("//testing/test.gni")
 
 service_manifest("manifest") {

diff --git a/components/services/heap_profiling/BUILD.gn b/components/services/heap_profiling/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 

diff --git a/components/services/patch/BUILD.gn b/components/services/patch/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/components/services/pdf_compositor/BUILD.gn b/components/services/pdf_compositor/BUILD.gn
@@ -3,9 +3,7 @@
 # found in the LICENSE file.
 
 import("//printing/buildflags/buildflags.gni")
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/service_manager/public/tools/test/service_test.gni")
 
 static_library("pdf_compositor") {
   sources = [

diff --git a/components/services/unzip/BUILD.gn b/components/services/unzip/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -1918,7 +1918,6 @@ test("content_unittests") {
     "//services/network/public/cpp",
     "//services/network/public/mojom",
     "//services/proxy_resolver/:lib",
-    "//services/service_manager/public/cpp:service_test_support",
     "//services/service_manager/public/cpp/test:test_support",
     "//services/video_capture/public/cpp:mocks",
     "//services/video_capture/public/mojom",

diff --git a/services/audio/BUILD.gn b/services/audio/BUILD.gn
@@ -7,7 +7,6 @@ import("//media/webrtc/audio_processing.gni")
 import("//services/catalog/public/tools/catalog.gni")
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
-import("//services/service_manager/public/tools/test/service_test.gni")
 import("//testing/test.gni")
 
 # Currently standalone service binaries are not supported on Android or iOS.

diff --git a/services/catalog/BUILD.gn b/services/catalog/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 

diff --git a/services/data_decoder/BUILD.gn b/services/data_decoder/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 

diff --git a/services/file/BUILD.gn b/services/file/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/services/media_session/BUILD.gn b/services/media_session/BUILD.gn
@@ -2,14 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# There should be only one media session service. It is currently in the
-# browser process. So, only //content/browser should link to this target.
-# Others modules should only need the public targets.
-import("//services/catalog/public/tools/catalog.gni")
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
+# There should be only one media session service. It is currently in the
+# browser process. So, only //content/browser should link to this target.
+# Others modules should only need the public targets.
 source_set("lib") {
   sources = [
     "audio_focus_manager.cc",

diff --git a/services/proxy_resolver/BUILD.gn b/services/proxy_resolver/BUILD.gn
@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 
 source_set("lib") {

diff --git a/services/service_manager/background/tests/BUILD.gn b/services/service_manager/background/tests/BUILD.gn
@@ -20,6 +20,7 @@ source_set("unittests") {
     "//base/test:test_support",
     "//services/service_manager/background:lib",
     "//services/service_manager/public/cpp",
+    "//services/service_manager/tests:catalog_source",
     "//testing/gtest",
     "//url",
   ]

diff --git a/services/service_manager/background/tests/background_service_manager_unittest.cc b/services/service_manager/background/tests/background_service_manager_unittest.cc
@@ -13,7 +13,8 @@
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/constants.h"
 #include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_binding.h"
+#include "services/service_manager/tests/catalog_source.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace service_manager {
@@ -25,10 +26,15 @@ const char kAppName[] = "background_service_manager_test_service";
 // The parent unit test suite service, not the underlying test service.
 class ServiceImpl : public Service {
  public:
-  ServiceImpl() {}
-  ~ServiceImpl() override {}
+  explicit ServiceImpl(mojom::ServiceRequest request)
+      : binding_(this, std::move(request)) {}
+  ~ServiceImpl() override = default;
+
+  Connector* connector() { return binding_.GetConnector(); }
 
  private:
+  ServiceBinding binding_;
+
   DISALLOW_COPY_AND_ASSIGN(ServiceImpl);
 };
 
@@ -49,18 +55,18 @@ void SetFlagAndRunClosure(bool* flag, const base::Closure& closure) {
 #endif
 TEST(BackgroundServiceManagerTest, MAYBE_Basic) {
   base::test::ScopedTaskEnvironment scoped_task_environment;
-  BackgroundServiceManager background_service_manager(nullptr, nullptr);
+  BackgroundServiceManager background_service_manager(
+      nullptr, test::CreateTestCatalog());
   mojom::ServicePtr service;
-  ServiceContext service_context(std::make_unique<ServiceImpl>(),
-                                 mojo::MakeRequest(&service));
+  ServiceImpl service_impl(mojo::MakeRequest(&service));
   background_service_manager.RegisterService(
       Identity(kTestName, kSystemInstanceGroup, base::Token{},
                base::Token::CreateRandom()),
       std::move(service), nullptr);
 
   mojom::TestServicePtr test_service;
-  service_context.connector()->BindInterface(ServiceFilter::ByName(kAppName),
-                                             &test_service);
+  service_impl.connector()->BindInterface(ServiceFilter::ByName(kAppName),
+                                          &test_service);
   base::RunLoop run_loop;
   bool got_result = false;
   test_service->Test(

diff --git a/services/service_manager/public/cpp/BUILD.gn b/services/service_manager/public/cpp/BUILD.gn
@@ -107,31 +107,6 @@ component("mojom_traits") {
   defines = [ "IS_SERVICE_MANAGER_MOJOM_TRAITS_IMPL" ]
 }
 
-static_library("service_test_support") {
-  testonly = true
-  sources = [
-    "service_test.cc",
-    "service_test.h",
-  ]
-
-  public_deps = [
-    ":cpp",
-    "//testing/gtest",
-  ]
-
-  deps = [
-    "//base",
-    "//base/test:test_support",
-    "//mojo/core/embedder",
-    "//mojo/public/cpp/bindings",
-    "//mojo/public/cpp/system",
-    "//services/service_manager/background:lib",
-    "//services/service_manager/public/mojom",
-  ]
-
-  data_deps = []
-}
-
 source_set("tests") {
   testonly = true
   sources = [