Introduce internal::ServiceRegistry to prepare for ServiceProvider split.

mojo/public/cpp/application/application.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_APPLICATION_H_
 #define MOJO_PUBLIC_APPLICATION_APPLICATION_H_
 #include <vector>
 
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/lib/service_connector.h"
@@ skipping 46 matching lines @@
 //
 // Create an Application instance that collects any service implementations.
 //
 // Application app(service_provider_handle);
 // app.AddService<FooImpl>();
 //
 // BarContext context;
 // app.AddService<BarImpl>(&context);
 //
 //
-class Application : public internal::ServiceConnectorBase::Owner {
+class Application {
  public:
   Application();
   explicit Application(ScopedMessagePipeHandle service_provider_handle);
   explicit Application(MojoHandle service_provider_handle);
   virtual ~Application();
 
+  virtual bool IsConnectionValid(const mojo::String& service_name,

[darin (slow to review), 2014/06/12 16:11:51]

nit: some documentation for this method would be helpful.

[DaveMoore, 2014/06/12 16:28:14]

Done.

+                                 const mojo::String& requestor_url);
+
+  template <typename Impl, typename Context>
+  void AddService(Context* context) {
+    service_registry_.AddServiceConnector(
+        new internal::ServiceConnector<Impl, Context>(Impl::Name_, context));
+  }
+
+  template <typename Impl>
+  void AddService() {
+    service_registry_.AddServiceConnector(
+        new internal::ServiceConnector<Impl, void>(Impl::Name_, NULL));
+  }
+
+  template <typename Interface>
+  void ConnectTo(const std::string& url, InterfacePtr<Interface>* ptr) {
+    mojo::ConnectToService(service_provider(), url, ptr);
+  }
+
+  ServiceProvider* service_provider() {
+      return service_registry_.service_provider();

[darin (slow to review), 2014/06/12 16:11:51]

nit: indentation

[DaveMoore, 2014/06/12 16:28:13]

Done.

+  }
+
+  void BindServiceProvider(ScopedMessagePipeHandle service_provider_handle);
+
+ protected:
   // Override this to do any necessary initialization. There's no need to call
   // Application's implementation.
   // The service_provider will be bound to its pipe before this is called.
   virtual void Initialize();
 
-  template <typename Impl, typename Context>
-  void AddService(Context* context) {
-    AddServiceConnector(
-        new internal::ServiceConnector<Impl, Context>(Impl::Name_, context));
-  }
-
-  template <typename Impl>
-  void AddService() {
-    AddServiceConnector(
-        new internal::ServiceConnector<Impl, void>(Impl::Name_, NULL));
-  }
-
-  template <typename Interface>
-  void ConnectTo(const std::string& url,
-                 InterfacePtr<Interface>* ptr) {
-    mojo::ConnectToService(service_provider(), url, ptr);
-  }
-
-  ServiceProvider* service_provider() { return service_provider_.get(); }
-  void BindServiceProvider(ScopedMessagePipeHandle service_provider_handle);
-
- protected:
-  // ServiceProvider methods.
-  // Override this to dispatch to correct service when there's more than one.
-  virtual void ConnectToService(const mojo::String& service_url,
-                                const mojo::String& service_name,
-                                ScopedMessagePipeHandle client_handle,
-                                const mojo::String& requestor_url)
-      MOJO_OVERRIDE;
-
  private:
   friend MojoResult (::MojoMain)(MojoHandle);
 
   // Implement this method to create the specific subclass of Application.
   static Application* Create();
 
-  // internal::ServiceConnectorBase::Owner methods.
-  // Takes ownership of |service_connector|.
-  virtual void AddServiceConnector(
-      internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE;
-  virtual void RemoveServiceConnector(
-      internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE;
+  internal::ServiceRegistry service_registry_;
 
-  typedef std::map<std::string, internal::ServiceConnectorBase*>
-      NameToServiceConnectorMap;
-  NameToServiceConnectorMap name_to_service_connector_;
+  MOJO_DISALLOW_COPY_AND_ASSIGN(Application);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_APPLICATION_APPLICATION_H_