Add name to services

mojo/service_manager/service_manager_unittest.cc

 // 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.
 
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
@@ skipping 90 matching lines @@
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
     if (quit_after_error_) {
       base::MessageLoop::current()->PostTask(FROM_HERE,
                                              base::MessageLoop::QuitClosure());
     }
   }
 
-
   scoped_ptr<Application> test_app_;
   TestContext* context_;
   int num_loads_;
   bool quit_after_error_;
   DISALLOW_COPY_AND_ASSIGN(TestServiceLoader);
 };
 
 class TestServiceInterceptor : public ServiceManager::Interceptor {
  public:
   TestServiceInterceptor() : call_count_(0) {}
@@ skipping 36 matching lines @@
     MessagePipe pipe;
     TestServicePtr service_proxy = MakeProxy<TestService>(pipe.handle0.Pass());
     test_client_.reset(new TestClientImpl(service_proxy.Pass()));
 
     TestServiceLoader* default_loader = new TestServiceLoader;
     default_loader->set_context(&context_);
     default_loader->set_quit_after_error(true);
     service_manager_->set_default_loader(
         scoped_ptr<ServiceLoader>(default_loader));
 
-    service_manager_->ConnectToService(test_url, pipe.handle1.Pass());
+    service_manager_->ConnectToService(
+        test_url, TestService::Name_, pipe.handle1.Pass());
   }
 
   virtual void TearDown() OVERRIDE {
     test_client_.reset(NULL);
     service_manager_.reset(NULL);
   }
 
   bool HasFactoryForTestURL() {
     ServiceManager::TestAPI manager_test_api(service_manager_.get());
     return manager_test_api.HasFactoryForURL(GURL(kTestURLString));
@@ skipping 54 matching lines @@
   ServiceManager sm;
   TestServiceLoader* default_loader = new TestServiceLoader;
   TestServiceLoader* url_loader = new TestServiceLoader;
   TestServiceLoader* scheme_loader = new TestServiceLoader;
   sm.set_default_loader(scoped_ptr<ServiceLoader>(default_loader));
   sm.SetLoaderForURL(scoped_ptr<ServiceLoader>(url_loader), GURL("test:test1"));
   sm.SetLoaderForScheme(scoped_ptr<ServiceLoader>(scheme_loader), "test");
 
   // test::test1 should go to url_loader.
   MessagePipe pipe1;
-  sm.ConnectToService(GURL("test:test1"), pipe1.handle0.Pass());
+  sm.ConnectToService(
+      GURL("test:test1"), TestService::Name_, pipe1.handle0.Pass());
   EXPECT_EQ(1, url_loader->num_loads());
   EXPECT_EQ(0, scheme_loader->num_loads());
   EXPECT_EQ(0, default_loader->num_loads());
 
   // test::test2 should go to scheme loader.
   MessagePipe pipe2;
-  sm.ConnectToService(GURL("test:test2"), pipe2.handle0.Pass());
+  sm.ConnectToService(
+      GURL("test:test2"), TestService::Name_, pipe2.handle0.Pass());
   EXPECT_EQ(1, url_loader->num_loads());
   EXPECT_EQ(1, scheme_loader->num_loads());
   EXPECT_EQ(0, default_loader->num_loads());
 
   // http::test1 should go to default loader.
   MessagePipe pipe3;
-  sm.ConnectToService(GURL("http:test1"), pipe3.handle0.Pass());
+  sm.ConnectToService(
+      GURL("http:test1"), TestService::Name_, pipe3.handle0.Pass());
   EXPECT_EQ(1, url_loader->num_loads());
   EXPECT_EQ(1, scheme_loader->num_loads());
   EXPECT_EQ(1, default_loader->num_loads());
 }
 
 TEST_F(ServiceManagerTest, Interceptor) {
   ServiceManager sm;
   TestServiceInterceptor interceptor;
   TestServiceLoader* default_loader = new TestServiceLoader;
   sm.set_default_loader(scoped_ptr<ServiceLoader>(default_loader));
   sm.SetInterceptor(&interceptor);
 
   std::string url("test:test3");
   MessagePipe pipe1;
-  sm.ConnectToService(GURL(url), pipe1.handle0.Pass());
+  sm.ConnectToService(GURL(url), TestService::Name_, pipe1.handle0.Pass());
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());
 }
 
 }  // namespace mojo