Mojo: Replace RemotePtr with InterfacePtr and InterfaceImpl

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/bindings/allocation_scope.h"
-#include "mojo/public/cpp/bindings/remote_ptr.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/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";
 
 struct TestContext {
   TestContext() : num_impls(0), num_loader_deletes(0) {}
   std::string last_test_string;
   int num_impls;
   int num_loader_deletes;
 };
 
 class TestServiceImpl :
     public ServiceConnection<TestService, TestServiceImpl, TestContext> {
  public:
-  TestServiceImpl() {}
+  TestServiceImpl() : client_(NULL) {}
 
   virtual ~TestServiceImpl() {
     if (context())
       --context()->num_impls;
   }
 
-  virtual void Test(const mojo::String& test_string) OVERRIDE {
-    context()->last_test_string = test_string.To<std::string>();
-    client()->AckTest();
-  }
-
-  void Initialize(
-      ServiceConnector<TestServiceImpl, TestContext>* service_factory,
-      ScopedMessagePipeHandle client_handle) {
-    ServiceConnection<TestService, TestServiceImpl, TestContext>::Initialize(
-        service_factory, client_handle.Pass());
+  void Initialize() {
     if (context())
       ++context()->num_impls;
   }
+
+  // TestService implementation:
+
+  virtual void SetClient(TestClient* client) OVERRIDE {
+    client_ = client;
+  }
+
+  virtual void Test(const mojo::String& test_string) OVERRIDE {
+    context()->last_test_string = test_string.To<std::string>();
+    client_->AckTest();
+  }
+
+ private:
+  TestClient* client_;
 };
 
 class TestClientImpl : public TestClient {
  public:
-  explicit TestClientImpl(ScopedTestServiceHandle service_handle)
-      : service_(service_handle.Pass(), this),
+  explicit TestClientImpl(TestServicePtr service)
+      : service_(service.Pass()),
         quit_after_ack_(false) {
+    service_->SetClient(this);
   }
 
   virtual ~TestClientImpl() {}
 
   virtual void AckTest() OVERRIDE {
     if (quit_after_ack_)
       base::MessageLoop::current()->Quit();
   }
 
   void Test(std::string test_string) {
     AllocationScope scope;
     quit_after_ack_ = true;
-    service_->Test(mojo::String(test_string));
+    service_->Test(test_string);
   }
 
  private:
-  RemotePtr<TestService> service_;
+  TestServicePtr service_;
   bool quit_after_ack_;
   DISALLOW_COPY_AND_ASSIGN(TestClientImpl);
 };
 
 class TestServiceLoader : public ServiceLoader {
  public:
   TestServiceLoader()
       : context_(NULL),
         num_loads_(0),
         quit_after_error_(false) {
   }
 
   virtual ~TestServiceLoader() {
     if (context_)
       ++context_->num_loader_deletes;
     test_app_.reset(NULL);
   }
 
   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,
-                           ScopedShellHandle shell_handle) OVERRIDE {
+                           ScopedMessagePipeHandle shell_handle) OVERRIDE {
     ++num_loads_;
     test_app_.reset(new Application(shell_handle.Pass()));
     test_app_->AddServiceConnector(
         new ServiceConnector<TestServiceImpl, TestContext>(context_));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
     if (quit_after_error_) {
       base::MessageLoop::current()->PostTask(FROM_HERE,
@@ skipping 41 matching lines @@
 class ServiceManagerTest : public testing::Test {
  public:
   ServiceManagerTest() {}
 
   virtual ~ServiceManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     GURL test_url(kTestURLString);
     service_manager_.reset(new ServiceManager);
 
-    InterfacePipe<TestService, AnyInterface> pipe;
-    test_client_.reset(new TestClientImpl(pipe.handle_to_self.Pass()));
+    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_->Connect(test_url, pipe.handle_to_peer.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 42 matching lines @@
     sm.SetLoaderForURL(scoped_ptr<ServiceLoader>(url_loader1),
                        GURL("test:test1"));
     sm.SetLoaderForURL(scoped_ptr<ServiceLoader>(url_loader2),
                        GURL("test:test1"));
     sm.SetLoaderForScheme(scoped_ptr<ServiceLoader>(scheme_loader1), "test");
     sm.SetLoaderForScheme(scoped_ptr<ServiceLoader>(scheme_loader2), "test");
   }
   EXPECT_EQ(5, context_.num_loader_deletes);
 }
 
+#if 0
 // Confirm that both urls and schemes can have their loaders explicitly set.
 TEST_F(ServiceManagerTest, SetLoaders) {
   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");
 
@@ skipping 26 matching lines @@
   sm.set_default_loader(scoped_ptr<ServiceLoader>(default_loader));
   sm.SetInterceptor(&interceptor);
 
   std::string url("test:test3");
   InterfacePipe<TestService, AnyInterface> pipe1;
   sm.Connect(GURL(url), pipe1.handle_to_peer.Pass());
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());
 }
+#endif
 
 }  // namespace mojo