Mojo: abstract interface implementation from generated Stub classes

mojo/services/native_viewport/native_viewport_service.cc

Index: mojo/services/native_viewport/native_viewport_service.cc
diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc
index af7ce8d7e0de9e97ae8c5f79a01240d093412ed1..0352ddf4781c43d240ce43436879151a0845a728 100644
--- a/mojo/services/native_viewport/native_viewport_service.cc
+++ b/mojo/services/native_viewport/native_viewport_service.cc
@@ -25,7 +25,7 @@ bool IsRateLimitedEventType(ui::Event* event) {
 }
 
 class NativeViewportService::NativeViewportImpl
-    : public NativeViewportStub,
+    : public mojo::NativeViewport,
       public NativeViewportDelegate {
  public:
   NativeViewportImpl(NativeViewportService* service,
@@ -34,8 +34,7 @@ class NativeViewportService::NativeViewportImpl
         widget_(gfx::kNullAcceleratedWidget),
         waiting_for_event_ack_(false),
         pending_event_timestamp_(0),
-        client_(client_handle.Pass()) {
-    client_.SetPeer(this);
+        client_(client_handle.Pass(), this) {
   }
   virtual ~NativeViewportImpl() {}
 
@@ -155,9 +154,8 @@ class NativeViewportService::NativeViewportImpl
 
 NativeViewportService::NativeViewportService(
     ScopedMessagePipeHandle shell_handle)
-    : shell_(shell_handle.Pass()),
+    : shell_(shell_handle.Pass(), this),
       context_(NULL) {
-  shell_.SetPeer(this);
 }
 
 NativeViewportService::~NativeViewportService() {}