Eliminate Connector::Connect(), Connection, etc.

services/service_manager/public/cpp/service_context.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_PUBLIC_CPP_SERVICE_CONTEXT_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
 
 #include <map>
 #include <memory>
 
@@ skipping 90 matching lines @@
   // Immediately severs the connection to the Service Manager and invokes the
   // quit closure (see SetQuitClosure() above) if one has been set.
   //
   // See comments on DisconnectFromServiceManager() regarding abrupt
   // disconnection from the Service Manager.
   void QuitNow();
 
  private:
   friend class service_manager::Service;
 
-  using InterfaceRegistryMap =
-      std::map<InterfaceRegistry*, std::unique_ptr<InterfaceRegistry>>;
-
   // mojom::Service:
   void OnStart(const ServiceInfo& info,
                const OnStartCallback& callback) override;
-  void OnConnect(const ServiceInfo& source_info,
-                 mojom::InterfaceProviderRequest interfaces,
-                 const OnConnectCallback& callback) override;
   void OnBindInterface(
       const ServiceInfo& source_info,
       const std::string& interface_name,
       mojo::ScopedMessagePipeHandle interface_pipe,
       const OnBindInterfaceCallback& callback) override;
 
-  void CallOnConnect(const ServiceInfo& source_info,
-                     const InterfaceProviderSpec& source_spec,
-                     const InterfaceProviderSpec& target_spec,
-                     mojom::InterfaceProviderRequest request);
-
   void OnConnectionError();
-  void OnRegistryConnectionError(InterfaceRegistry* registry);
-  void DestroyConnectionInterfaceRegistry(InterfaceRegistry* registry);
-
-  // We track the lifetime of incoming connection registries as a convenience
-  // for the client.
-  InterfaceRegistryMap connection_interface_registries_;
 
   // A pending Connector request which will eventually be passed to the Service
   // Manager.
   mojom::ConnectorRequest pending_connector_request_;
 
   std::unique_ptr<service_manager::Service> service_;
   mojo::Binding<mojom::Service> binding_;
   std::unique_ptr<Connector> connector_;
   service_manager::ServiceInfo local_info_;
 
@@ skipping 13 matching lines @@
   base::Closure quit_closure_;
 
   base::WeakPtrFactory<ServiceContext> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceContext);
 };
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_