Service Manager: Rework Service and ServiceContext lifetime

services/service_manager/service_manager.h

 // Copyright 2014 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_SERVICE_MANAGER_H_
 #define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 #include "services/service_manager/connect_params.h"
 #include "services/service_manager/native_runner.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/interface_provider_spec.h"
-#include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "services/service_manager/public/interfaces/resolver.mojom.h"
 #include "services/service_manager/public/interfaces/service.mojom.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 #include "services/service_manager/public/interfaces/service_manager.mojom.h"
 #include "services/service_manager/service_overrides.h"
 
 namespace service_manager {
+
 class ServiceContext;
 
 // Creates an identity for the Service Manager, used when the Service Manager
 // connects to services.
 Identity CreateServiceManagerIdentity();
 
-class ServiceManager : public Service {
+class ServiceManager {
  public:
   // API for testing.
   class TestAPI {
    public:
     explicit TestAPI(ServiceManager* service_manager);
     ~TestAPI();
 
     // Returns true if there is a Instance for this name.
     bool HasRunningInstanceForName(const std::string& name) const;
    private:
     ServiceManager* service_manager_;
 
     DISALLOW_COPY_AND_ASSIGN(TestAPI);
   };
 
   // |native_runner_factory| is an instance of an object capable of vending
   // implementations of NativeRunner, e.g. for in or out-of-process execution.
   // See native_runner.h and RunNativeApplication().
   // |file_task_runner| provides access to a thread to perform file copy
   // operations on.
   ServiceManager(std::unique_ptr<NativeRunnerFactory> native_runner_factory,
                  mojom::ServicePtr catalog);
-  ~ServiceManager() override;
+  ~ServiceManager();
 
   // Sets overrides for service executable and package resolution. Must be
   // called before any services are launched.
   void SetServiceOverrides(std::unique_ptr<ServiceOverrides> overrides);
 
   // Provide a callback to be notified whenever an instance is destroyed.
   // Typically the creator of the Service Manager will use this to determine
   // when some set of services it created are destroyed, so it can shut down.
   void SetInstanceQuitCallback(base::Callback<void(const Identity&)> callback);
 
   // Completes a connection between a source and target application as defined
   // by |params|, exchanging InterfaceProviders between them. If no existing
   // instance of the target application is running, one will be loaded.
   void Connect(std::unique_ptr<ConnectParams> params);
 
   // Creates a new Instance identified as |name|. This is intended for use by
   // the Service Manager's embedder to register itself. This must only be called
   // once.
   mojom::ServiceRequest StartEmbedderService(const std::string& name);
 
  private:
   class Instance;
-
-  // Service:
-  bool OnConnect(const ServiceInfo& remote_info,
-                 InterfaceRegistry* registry) override;
+  class ServiceImpl;
 
   void InitCatalog(mojom::ServicePtr catalog);
 
   // Returns the resolver to use for the specified identity.
   // NOTE: Resolvers are cached to ensure we service requests in order. If
   // we use a separate Resolver for each request ordering is not
   // guaranteed and can lead to random flake.
   mojom::Resolver* GetResolver(const Identity& identity);
 
   // Called when |instance| encounters an error. Deletes |instance|.
@@ skipping 90 matching lines @@
   base::WeakPtrFactory<ServiceManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceManager);
 };
 
 mojom::Connector::ConnectCallback EmptyConnectCallback();
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_