Revert of [Service Manager] Get rid of dynamic service discovery

services/service_manager/background/tests/background_service_manager_unittest.cc

 // Copyright 2016 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/background/background_service_manager.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
@@ skipping 35 matching lines @@
 // and connects to background_service_manager_test_service, verifying we can
 // send a message to the service.
 #if defined(OS_ANDROID)
 // TODO(crbug.com/589784): This test is disabled, as it fails
 // on the Android GN bot.
 #define MAYBE_Basic DISABLED_Basic
 #else
 #define MAYBE_Basic Basic
 #endif
 TEST(BackgroundServiceManagerTest, MAYBE_Basic) {
-  BackgroundServiceManager background_service_manager(nullptr, nullptr);
+  BackgroundServiceManager background_service_manager;
   base::MessageLoop message_loop;
-  mojom::ServicePtr service;
-  ServiceContext service_context(base::MakeUnique<ServiceImpl>(),
-                                 mojom::ServiceRequest(&service));
-  background_service_manager.RegisterService(
-      Identity(kTestName, mojom::kRootUserID), std::move(service), nullptr);
-
+  background_service_manager.Init(nullptr);
+  ServiceContext service_context(
+      base::MakeUnique<ServiceImpl>(),
+      background_service_manager.CreateServiceRequest(kTestName));
   mojom::TestServicePtr test_service;
   service_context.connector()->BindInterface(kAppName, &test_service);
   base::RunLoop run_loop;
   bool got_result = false;
   test_service->Test(
       base::Bind(&SetFlagAndRunClosure, &got_result, run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_TRUE(got_result);
 }
 
 }  // namespace service_manager