Add name to services

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>
@@ skipping 59 matching lines @@
     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() : owner_(NULL) {}
+  ServiceConnectorBase(const std::string& name) : name_(name), owner_(NULL) {}
   virtual ~ServiceConnectorBase();
   virtual void ConnectToService(const std::string& url,
+                                const std::string& name,
                                 ScopedMessagePipeHandle client_handle) = 0;
+  std::string name() const { return name_; }
 
  protected:
+  std::string name_;
   Owner* owner_;
 };
 
 template <class ServiceImpl, typename Context=void>
 class ServiceConnector : public internal::ServiceConnectorBase {
  public:
-  ServiceConnector(Context* context = NULL) : context_(context) {}
+  ServiceConnector(const std::string& name, Context* context = NULL)
+      : ServiceConnectorBase(name), context_(context) {}
 
   virtual ~ServiceConnector() {
     ConnectionList doomed;
     doomed.swap(connections_);
     for (typename ConnectionList::iterator it = doomed.begin();
          it != doomed.end(); ++it) {
       delete *it;
     }
     assert(connections_.empty());  // No one should have added more!
   }
 
   virtual void ConnectToService(const std::string& url,
+                                const std::string& name,
                                 ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
     ServiceConnection<ServiceImpl, Context>* impl =
         ServiceConstructor<ServiceImpl, Context>::New(context_);
     impl->set_service_connector(this);
     BindToPipe(impl, handle.Pass());
 
     connections_.push_back(impl);
   }
 
   void RemoveConnection(ServiceImpl* impl) {
@@ skipping 15 matching lines @@
  private:
   typedef std::vector<ServiceImpl*> ConnectionList;
   ConnectionList connections_;
   Context* context_;
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_APPLICATION_LIB_SERVICE_CONNECTOR_H_