Introduce internal::ServiceRegistry to prepare for ServiceProvider split.

mojo/public/cpp/application/lib/service_connector.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_LIB_SERVICE_CONNECTOR_H_
 #define MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_H_
 
 #include <assert.h>
 
 #include <vector>
 
+#include "mojo/public/cpp/application/lib/service_registry.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace mojo {
 namespace internal {
 
 template <class ServiceImpl, typename Context>
 class ServiceConnector;
 
 // Specialization of ServiceConnection.
 // ServiceImpl: Subclass of InterfaceImpl<...>.
@@ skipping 12 matching lines @@
 private:
   friend class ServiceConnector<ServiceImpl, Context>;
 
   // Called shortly after this class is instantiated.
   void set_service_connector(
       ServiceConnector<ServiceImpl, Context>* connector) {
     service_connector_ = connector;
   }
 
   ServiceConnector<ServiceImpl, Context>* service_connector_;
+
+  MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceConnection);
 };
 
 template <typename ServiceImpl, typename Context>
 struct ServiceConstructor {
   static ServiceConnection<ServiceImpl, Context>* New(Context* context) {
     return new ServiceConnection<ServiceImpl, Context>(context);
   }
 };
 
 template <typename ServiceImpl>
 struct ServiceConstructor<ServiceImpl, void> {
  public:
   static ServiceConnection<ServiceImpl, void>* New(void* context) {
     return new ServiceConnection<ServiceImpl, void>();
   }
 };
 
 class ServiceConnectorBase {
  public:
-  class Owner : public ServiceProvider {
-   public:
-    Owner();
-    Owner(ScopedMessagePipeHandle service_provider_handle);
-    virtual ~Owner();
-    virtual void AddServiceConnector(
-        internal::ServiceConnectorBase* service_connector) = 0;
-    virtual void RemoveServiceConnector(
-        internal::ServiceConnectorBase* service_connector) = 0;
-
-   protected:
-    void set_service_connector_owner(ServiceConnectorBase* service_connector,
-                                     Owner* owner) {
-      service_connector->owner_ = owner;
-    }
-    ServiceProviderPtr service_provider_;
-  };
-  ServiceConnectorBase(const std::string& name) : name_(name), owner_(NULL) {}
+  ServiceConnectorBase(const std::string& name);
   virtual ~ServiceConnectorBase();
   virtual void ConnectToService(const std::string& url,
                                 const std::string& name,
                                 ScopedMessagePipeHandle client_handle) = 0;
   std::string name() const { return name_; }
+  void set_registry(ServiceRegistry* registry) { registry_ = registry; }
 
  protected:
   std::string name_;
-  Owner* owner_;
+  ServiceRegistry* registry_;
+
+  MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceConnectorBase);
 };
 
 template <class ServiceImpl, typename Context=void>
 class ServiceConnector : public internal::ServiceConnectorBase {
  public:
   ServiceConnector(const std::string& name, Context* context = NULL)
       : ServiceConnectorBase(name), context_(context) {}
 
   virtual ~ServiceConnector() {
     ConnectionList doomed;
@@ skipping 27 matching lines @@
       }
     }
   }
 
   Context* context() const { return context_; }
 
  private:
   typedef std::vector<ServiceImpl*> ConnectionList;
   ConnectionList connections_;
   Context* context_;
+
+  MOJO_DISALLOW_COPY_AND_ASSIGN(ServiceConnector);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_H_