Mojo: abstract interface implementation from generated Stub classes

mojo/public/tests/bindings_handle_passing_unittest.cc

Index: mojo/public/tests/bindings_handle_passing_unittest.cc
diff --git a/mojo/public/tests/bindings_handle_passing_unittest.cc b/mojo/public/tests/bindings_handle_passing_unittest.cc
index df2735946776d3f399bb9990606cf7a111b6e222..2f687debd265c0ecadc6003ceb9b10dea91886e9 100644
--- a/mojo/public/tests/bindings_handle_passing_unittest.cc
+++ b/mojo/public/tests/bindings_handle_passing_unittest.cc
@@ -15,11 +15,10 @@ 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,
@@ -54,12 +53,11 @@ class SampleFactoryImpl : public sample::FactoryStub {
   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() {