Shell / ShellClient -> ServiceProvider

mojo/service_manager/service_manager_unittest.cc

Index: mojo/service_manager/service_manager_unittest.cc
diff --git a/mojo/service_manager/service_manager_unittest.cc b/mojo/service_manager/service_manager_unittest.cc
index fd763b54ce4a893c1dcdaf5bad7025dd1041fdcc..0f18cbc60d1124b662b64227551f9da92c0095a2 100644
--- a/mojo/service_manager/service_manager_unittest.cc
+++ b/mojo/service_manager/service_manager_unittest.cc
@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 #include "base/message_loop/message_loop.h"
+#include "mojo/public/cpp/application/application.h"
+#include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
-#include "mojo/public/cpp/shell/application.h"
-#include "mojo/public/interfaces/shell/shell.mojom.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"
 #include "mojo/service_manager/test.mojom.h"
@@ -93,11 +94,12 @@ class TestServiceLoader : public ServiceLoader {
   int num_loads() const { return num_loads_; }
 
  private:
-  virtual void LoadService(ServiceManager* manager,
-                           const GURL& url,
-                           ScopedMessagePipeHandle shell_handle) OVERRIDE {
+  virtual void LoadService(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle service_provider_handle) OVERRIDE {
     ++num_loads_;
-    test_app_.reset(new Application(shell_handle.Pass()));
+    test_app_.reset(new Application(service_provider_handle.Pass()));
     test_app_->AddService<TestServiceImpl>(context_);
   }
 
@@ -166,7 +168,7 @@ class ServiceManagerTest : public testing::Test {
     service_manager_->set_default_loader(
         scoped_ptr<ServiceLoader>(default_loader));
 
-    service_manager_->Connect(test_url, pipe.handle1.Pass());
+    service_manager_->ConnectToService(test_url, pipe.handle1.Pass());
   }
 
   virtual void TearDown() OVERRIDE {
@@ -241,21 +243,21 @@ TEST_F(ServiceManagerTest, SetLoaders) {
 
   // test::test1 should go to url_loader.
   MessagePipe pipe1;
-  sm.Connect(GURL("test:test1"), pipe1.handle0.Pass());
+  sm.ConnectToService(GURL("test:test1"), 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.Connect(GURL("test:test2"), pipe2.handle0.Pass());
+  sm.ConnectToService(GURL("test:test2"), 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.Connect(GURL("http:test1"), pipe3.handle0.Pass());
+  sm.ConnectToService(GURL("http:test1"), pipe3.handle0.Pass());
   EXPECT_EQ(1, url_loader->num_loads());
   EXPECT_EQ(1, scheme_loader->num_loads());
   EXPECT_EQ(1, default_loader->num_loads());
@@ -270,7 +272,7 @@ TEST_F(ServiceManagerTest, Interceptor) {
 
   std::string url("test:test3");
   MessagePipe pipe1;
-  sm.Connect(GURL(url), pipe1.handle0.Pass());
+  sm.ConnectToService(GURL(url), pipe1.handle0.Pass());
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());