Change InterfaceFactory<I>::Create() to take a ConnectionContext instead of an ApplicationConnectio…

mojo/public/cpp/application/service_provider_impl.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 MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_
 #define MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_
 
 #include <functional>
 #include <string>
 
@@ skipping 19 matching lines @@
   template <typename Interface>
   using InterfaceRequestHandler =
       std::function<void(const ConnectionContext& connection_context,
                          InterfaceRequest<Interface> interface_request)>;
 
   // Constructs this service provider implementation in an unbound state.
   ServiceProviderImpl();
 
   // Constructs this service provider implementation, binding it to the given
   // interface request.
-  // TODO(vtl): This should take a |ConnectionContext|, to provide
-  // |InterfaceRequestHandler<I>|s.
   explicit ServiceProviderImpl(
+      const ConnectionContext& connection_context,
       InterfaceRequest<ServiceProvider> service_provider_request);
 
   ~ServiceProviderImpl() override;
 
   // Binds this service provider implementation to the given interface request.
   // This may only be called if this object is unbound.
-  // TODO(vtl): This should take a |ConnectionContext|, to provide
-  // |InterfaceRequestHandler<I>|s.
-  void Bind(InterfaceRequest<ServiceProvider> service_provider_request);
+  void Bind(const ConnectionContext& connection_context,
+            InterfaceRequest<ServiceProvider> service_provider_request);
 
   // Disconnect this service provider implementation and put it in a state where
   // it can be rebound to a new request (i.e., restores this object to an
   // unbound state). This may be called even if this object is already unbound.
   void Close();
 
   // TODO(vtl): Remove this.
   template <typename Interface>
   void AddService(InterfaceFactory<Interface>* factory,
                   const std::string& interface_name = Interface::Name_) {
@@ skipping 41 matching lines @@
   // request (i.e., |ServiceConnector::ConnectToService()|) to the type-safe
   // |InterfaceRequestHandler<Interface>|.
   template <typename Interface>
   class ServiceConnectorImpl : public ServiceConnector {
    public:
     explicit ServiceConnectorImpl(
         InterfaceRequestHandler<Interface> interface_request_handler)
         : interface_request_handler_(std::move(interface_request_handler)) {}
     ~ServiceConnectorImpl() override {}
 
-    void ConnectToService(ApplicationConnection* application_connection,
+    void ConnectToService(const mojo::ConnectionContext& connection_context,
                           const std::string& interface_name,
                           ScopedMessagePipeHandle client_handle) override {
-      // TODO(vtl): This should be given a |const ConnectionContext&|, instead
-      // of an |ApplicationConnection*| -- which may be null!
       interface_request_handler_(
-          application_connection
-              ? application_connection->GetConnectionContext()
-              : ConnectionContext(),
+          connection_context,
           InterfaceRequest<Interface>(client_handle.Pass()));
     }
 
    private:
     const InterfaceRequestHandler<Interface> interface_request_handler_;
 
     MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceConnectorImpl);
   };
 
   // Overridden from |ServiceProvider|:
   void ConnectToService(const String& service_name,
                         ScopedMessagePipeHandle client_handle) override;
 
+  ConnectionContext connection_context_;
   Binding<ServiceProvider> binding_;
 
   internal::ServiceConnectorRegistry service_connector_registry_;
   ServiceProvider* fallback_service_provider_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceProviderImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_APPLICATION_SERVICE_PROVIDER_IMPL_H_