ApplicationConnection devolution, part 4 (the end).

mojo/public/cpp/application/application_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_CPP_APPLICATION_APPLICATION_IMPL_H_
 #define MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "mojo/public/cpp/application/application_delegate.h"
-#include "mojo/public/cpp/application/lib/service_registry.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/application_connector.mojom.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 
 namespace mojo {
 
+class ServiceProviderImpl;
+
 // Implements the Application interface, which the shell uses for basic
 // communication with an application (e.g., to connect clients to services
 // provided by an application). Also provides the application access to the
 // Shell, which, e.g., may be used by an application to connect to other
 // services.
 //
 // Typically, you create one or more classes implementing your APIs (e.g.,
 // FooImpl implementing Foo). See bindings/binding.h for more information. Then
 // you implement an mojo::ApplicationDelegate whose
 // ConfigureIncomingConnection() adds services to each connection. Finally, you
@@ skipping 43 matching lines @@
   void Initialize(InterfaceHandle<Shell> shell,
                   Array<String> args,
                   const mojo::String& url) override;
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
                         InterfaceHandle<ServiceProvider> exposed_services,
                         const String& url) override;
   void RequestQuit() override;
 
  private:
-  using ServiceRegistryList =
-      std::vector<std::unique_ptr<internal::ServiceRegistry>>;
-  ServiceRegistryList incoming_service_registries_;
+  std::vector<std::unique_ptr<ServiceProviderImpl>> service_provider_impls_;
   ApplicationDelegate* delegate_;
   Binding<Application> binding_;
   ShellPtr shell_;
   std::string url_;
   std::vector<std::string> args_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_IMPL_H_