Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/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/application/application.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/cpp/shell/application.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/service_manager/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
 
 const char kTestURLString[] = "test:testService";
 
@@ skipping 66 matching lines @@
   }
 
   void set_context(TestContext* context) { context_ = context; }
   void set_quit_after_error(bool quit_after_error) {
     quit_after_error_ = quit_after_error;
   }
 
   int num_loads() const { return num_loads_; }
 
  private:
-  virtual void LoadService(
-      ServiceManager* manager,
-      const GURL& url,
-      ScopedMessagePipeHandle service_provider_handle) OVERRIDE {
+  virtual void LoadService(ServiceManager* manager,
+                           const GURL& url,
+                           ScopedMessagePipeHandle shell_handle) OVERRIDE {
     ++num_loads_;
-    test_app_.reset(new Application(service_provider_handle.Pass()));
+    test_app_.reset(new Application(shell_handle.Pass()));
     test_app_->AddService<TestServiceImpl>(context_);
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
     if (quit_after_error_) {
       base::MessageLoop::current()->PostTask(FROM_HERE,
                                              base::MessageLoop::QuitClosure());
     }
   }
@@ skipping 48 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_->Connect(test_url, 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.Connect(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.ConnectToService(GURL("test:test2"), pipe2.handle0.Pass());
+  sm.Connect(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.ConnectToService(GURL("http:test1"), pipe3.handle0.Pass());
+  sm.Connect(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());
 }
 
 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.Connect(GURL(url), pipe1.handle0.Pass());
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());
 }
 
 }  // namespace mojo