Mojo: abstract interface implementation from generated Stub classes

mojo/shell/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/common/bindings_support_impl.h"
 #include "mojo/public/bindings/lib/remote_ptr.h"
 #include "mojo/shell/service_manager.h"
 #include "mojom/shell.h"
 #include "mojom/test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
-class TestApp : public ShellClientStub {
+class TestApp : public ShellClient {
  public:
   TestApp(ScopedMessagePipeHandle shell_handle)
-      : shell_(shell_handle.Pass()) {
-    shell_.SetPeer(this);
+      : shell_(shell_handle.Pass(), this) {
   }
   virtual ~TestApp() {
   }
   virtual void AcceptConnection(ScopedMessagePipeHandle client_handle)
       MOJO_OVERRIDE {
     service_.reset(new TestServiceImpl(this, client_handle.Pass()));
   }
   std::string GetLastTestString() {
     return service_->last_test_string_;
   }
 
  private:
-  class TestServiceImpl : public TestServiceStub {
+  class TestServiceImpl : public TestService {
    public:
     TestServiceImpl(TestApp* service, ScopedMessagePipeHandle client_handle)
         : service_(service),
-          client_(client_handle.Pass()) {
-      client_.SetPeer(this);
+          client_(client_handle.Pass(), this) {
     }
     virtual ~TestServiceImpl() {
     }
     virtual void Test(const mojo::String& test_string) OVERRIDE {
       last_test_string_ = test_string.To<std::string>();
       client_->AckTest();
     }
     TestApp* service_;
     RemotePtr<TestClient> client_;
     std::string last_test_string_;
   };
   RemotePtr<Shell> shell_;
   scoped_ptr<TestServiceImpl> service_;
 };
 
-class TestClientImpl : public TestClientStub {
+class TestClientImpl : public TestClient {
  public:
   explicit TestClientImpl(ScopedMessagePipeHandle service_handle)
-      : service_(service_handle.Pass()),
+      : service_(service_handle.Pass(), this),
         quit_after_ack_(false) {
-    service_.SetPeer(this);
   }
   virtual ~TestClientImpl() {
   }
   virtual void AckTest() OVERRIDE {
     if (quit_after_ack_)
       base::MessageLoop::current()->QuitNow();
   }
   void Test(std::string test_string) {
     AllocationScope scope;
     quit_after_ack_ = true;
@@ skipping 45 matching lines @@
 
 TEST_F(ServiceManagerTest, Basic) {
   test_client_->Test("test");
   loop_.Run();
   EXPECT_EQ(std::string("test"), test_app_->GetLastTestString());
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo