Mojo: abstract interface implementation from generated Stub classes

mojo/public/tests/bindings_handle_passing_unittest.cc

 // Copyright 2013 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 "mojo/public/bindings/lib/remote_ptr.h"
 #include "mojo/public/tests/simple_bindings_support.h"
 #include "mojo/public/tests/test_support.h"
 #include "mojom/sample_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
 const char kText1[] = "hello";
 const char kText2[] = "world";
 
-class SampleFactoryImpl : public sample::FactoryStub {
+class SampleFactoryImpl : public sample::Factory {
  public:
   explicit SampleFactoryImpl(ScopedMessagePipeHandle pipe)
-      : client_(pipe.Pass()) {
-    client_.SetPeer(this);
+      : client_(pipe.Pass(), this) {
   }
 
   virtual void DoStuff(const sample::Request& request,
                        ScopedMessagePipeHandle pipe) MOJO_OVERRIDE {
     std::string text1;
     if (pipe.is_valid())
       EXPECT_TRUE(ReadTextMessage(pipe.get(), &text1));
 
     std::string text2;
     if (request.pipe().is_valid()) {
@@ skipping 14 matching lines @@
     response.set_x(2);
     response.set_pipe(pipe0.Pass());
     client_->DidStuff(response.Finish(), text1);
   }
 
  private:
   RemotePtr<sample::FactoryClient> client_;
   ScopedMessagePipeHandle pipe1_;
 };
 
-class SampleFactoryClientImpl : public sample::FactoryClientStub {
+class SampleFactoryClientImpl : public sample::FactoryClient {
  public:
   explicit SampleFactoryClientImpl(ScopedMessagePipeHandle pipe)
-      : factory_(pipe.Pass()),
+      : factory_(pipe.Pass(), this),
         got_response_(false) {
-    factory_.SetPeer(this);
   }
 
   void Start() {
     expected_text_reply_ = kText1;
 
     ScopedMessagePipeHandle pipe0;
     CreateMessagePipe(&pipe0, &pipe1_);
 
     EXPECT_TRUE(WriteTextMessage(pipe1_.get(), kText1));
 
@@ skipping 93 matching lines @@
 
   EXPECT_FALSE(factory_client.got_response());
 
   PumpMessages();
 
   EXPECT_TRUE(factory_client.got_response());
 }
 
 }  // namespace test
 }  // namespace mojo