Mojo: abstract interface implementation from generated Stub classes

mojo/examples/sample_app/sample_app.cc

Index: mojo/examples/sample_app/sample_app.cc
diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc
index 4d6ea83c1394aa2e6b42c0652247aa3acc46b5ea..b3bd71f0ede7f4c56b7f4037dd8364ce2669ed66 100644
--- a/mojo/examples/sample_app/sample_app.cc
+++ b/mojo/examples/sample_app/sample_app.cc
@@ -29,11 +29,10 @@
 namespace mojo {
 namespace examples {
 
-class SampleApp : public ShellClientStub {
+class SampleApp : public ShellClient {
  public:
   explicit SampleApp(ScopedMessagePipeHandle shell_handle)
-      : shell_(shell_handle.Pass()) {
-    shell_.SetPeer(this);
+      : shell_(shell_handle.Pass(), this) {
 
     MessagePipe pipe;
     native_viewport_client_.reset(
@@ -47,11 +46,10 @@ class SampleApp : public ShellClientStub {
   }
 
  private:
-  class NativeViewportClientImpl : public mojo::NativeViewportClientStub {
+  class NativeViewportClientImpl : public mojo::NativeViewportClient {
    public:
     explicit NativeViewportClientImpl(ScopedMessagePipeHandle viewport_handle)
-        : viewport_(viewport_handle.Pass()) {
-      viewport_.SetPeer(this);
+        : viewport_(viewport_handle.Pass(), this) {
       viewport_->Open();
 
       MessagePipe pipe;