ApplicationConnection devolution, part 4 (the end).

mojo/public/cpp/application/application_impl.h

Index: mojo/public/cpp/application/application_impl.h
diff --git a/mojo/public/cpp/application/application_impl.h b/mojo/public/cpp/application/application_impl.h
index b4038dcc93260319d194e069c2f228b1582ef78a..dd613f1736eca7fe48b51ea1dba8304901f1c767 100644
--- a/mojo/public/cpp/application/application_impl.h
+++ b/mojo/public/cpp/application/application_impl.h
@@ -10,7 +10,6 @@
 #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"
@@ -18,6 +17,8 @@
 
 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
@@ -81,9 +82,7 @@ class ApplicationImpl : public Application {
   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_;