Revert of Service Manager: Implement graceful service termination

services/service_manager/tests/connect/connect_test_package.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 12 matching lines @@
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 #include "services/service_manager/tests/connect/connect_test.mojom.h"
 
 // Tests that multiple services can be packaged in a single service by
 // implementing ServiceFactory; that these services can be specified by
 // the package's manifest and are thus registered with the PackageManager.
 
 namespace service_manager {
 
+namespace {
+
+void QuitLoop(base::RunLoop* loop) {
+  loop->Quit();
+}
+
+}  // namespace
+
 using GetTitleCallback = test::mojom::ConnectTestService::GetTitleCallback;
 
 class ProvidedService
     : public Service,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public InterfaceFactory<test::mojom::BlockedInterface>,
       public InterfaceFactory<test::mojom::UserIdTest>,
       public test::mojom::ConnectTestService,
       public test::mojom::BlockedInterface,
       public test::mojom::UserIdTest,
       public base::SimpleThread {
  public:
   ProvidedService(const std::string& title, mojom::ServiceRequest request)
       : base::SimpleThread(title),
         title_(title),
         request_(std::move(request)) {
     Start();
   }
-
   ~ProvidedService() override {
     Join();
   }
 
  private:
-  class ForwardingServiceImpl : public Service {
-   public:
-    explicit ForwardingServiceImpl(Service* service)
-        : service_(service) {}
-    ~ForwardingServiceImpl() override {}
-
-    // Service:
-    void OnStart(ServiceContext* context) override {
-      service_->OnStart(context);
-    }
-
-    bool OnConnect(const ServiceInfo& remote_info,
-                   InterfaceRegistry* registry) override {
-      return service_->OnConnect(remote_info, registry);
-    }
-
-    bool OnStop() override { return service_->OnStop(); }
-
-   private:
-    Service* const service_;
-
-    DISALLOW_COPY_AND_ASSIGN(ForwardingServiceImpl);
-  };
-
   // service_manager::Service:
   void OnStart(ServiceContext* context) override {
     context_ = context;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedService::OnConnectionError,
                    base::Unretained(this)));
   }
 
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
@@ skipping 28 matching lines @@
   // InterfaceFactory<test::mojom::UserIdTest>:
   void Create(const Identity& remote_identity,
               test::mojom::UserIdTestRequest request) override {
     user_id_test_bindings_.AddBinding(this, std::move(request));
   }
 
   // test::mojom::ConnectTestService:
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run(title_);
   }
-
   void GetInstance(const GetInstanceCallback& callback) override {
     callback.Run(context_->identity().instance());
   }
 
   // test::mojom::BlockedInterface:
   void GetTitleBlocked(const GetTitleBlockedCallback& callback) override {
     callback.Run("Called Blocked Interface!");
   }
 
   // test::mojom::UserIdTest:
   void ConnectToClassAppAsDifferentUser(
       const service_manager::Identity& target,
       const ConnectToClassAppAsDifferentUserCallback& callback) override {
     Connector::ConnectParams params(target);
     std::unique_ptr<Connection> connection =
         context_->connector()->Connect(&params);
     {
       base::RunLoop loop;
-      connection->AddConnectionCompletedClosure(loop.QuitClosure());
+      connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
       base::MessageLoop::ScopedNestableTaskAllower allow(
           base::MessageLoop::current());
       loop.Run();
     }
     callback.Run(static_cast<int32_t>(connection->GetResult()),
                  connection->GetRemoteIdentity());
   }
 
   // base::SimpleThread:
   void Run() override {
-    ServiceRunner(new ForwardingServiceImpl(this)).Run(
-        request_.PassMessagePipe().release().value(), false);
-    caller_.reset();
-    bindings_.CloseAllBindings();
-    blocked_bindings_.CloseAllBindings();
-    user_id_test_bindings_.CloseAllBindings();
+    ServiceRunner(this).Run(request_.PassMessagePipe().release().value(),
+                            false);
+    delete this;
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   ServiceContext* context_ = nullptr;
   const std::string title_;
   mojom::ServiceRequest request_;
@@ skipping 11 matching lines @@
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ServiceFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestService() {}
   ~ConnectTestService() override {}
 
  private:
   // service_manager::Service:
   void OnStart(ServiceContext* context) override {
-    context_ = context;
-
-    base::Closure error_handler =
+    identity_ = context->identity();
+    bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestService::OnConnectionError,
-                   base::Unretained(this));
-    bindings_.set_connection_error_handler(error_handler);
-    service_factory_bindings_.set_connection_error_handler(error_handler);
+                   base::Unretained(this)));
   }
-
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<ServiceFactory>(this);
     registry->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
 
-  bool OnStop() override {
-    provided_services_.clear();
-    return true;
-  }
-
   // InterfaceFactory<mojom::ServiceFactory>:
   void Create(const Identity& remote_identity,
               mojom::ServiceFactoryRequest request) override {
     service_factory_bindings_.AddBinding(this, std::move(request));
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
   void Create(const Identity& remote_identity,
               test::mojom::ConnectTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::ServiceFactory:
   void CreateService(mojom::ServiceRequest request,
-                     const std::string& name) override {
-    if (name == "service:connect_test_a") {
-      provided_services_.emplace_back(
-          base::MakeUnique<ProvidedService>("A", std::move(request)));
-    } else if (name == "service:connect_test_b") {
-      provided_services_.emplace_back(
-          base::MakeUnique<ProvidedService>("B", std::move(request)));
-    }
+                         const std::string& name) override {
+    if (name == "service:connect_test_a")
+      new ProvidedService("A", std::move(request));
+    else if (name == "service:connect_test_b")
+      new ProvidedService("B", std::move(request));
   }
 
   // test::mojom::ConnectTestService:
   void GetTitle(const GetTitleCallback& callback) override {
     callback.Run("ROOT");
   }
-
   void GetInstance(const GetInstanceCallback& callback) override {
-    callback.Run(context_->identity().instance());
+    callback.Run(identity_.instance());
   }
 
   void OnConnectionError() {
-    if (bindings_.empty() && service_factory_bindings_.empty())
-      context_->RequestQuit();
+    if (bindings_.empty())
+      base::MessageLoop::current()->QuitWhenIdle();
   }
 
-  ServiceContext* context_ = nullptr;
+  Identity identity_;
   std::vector<std::unique_ptr<Service>> delegates_;
   mojo::BindingSet<mojom::ServiceFactory> service_factory_bindings_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
-  std::list<std::unique_ptr<ProvidedService>> provided_services_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestService);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(
       new service_manager::ConnectTestService);
   return runner.Run(service_request_handle);
 }