Mojo: abstract interface implementation from generated Stub classes

mojo/shell/service_manager.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/shell/service_manager.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/scoped_native_library.h"
 #include "base/threading/simple_thread.h"
 #include "mojo/public/bindings/lib/remote_ptr.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/switches.h"
 #include "mojom/shell.h"
 
 typedef MojoResult (*MojoMainFunction)(MojoHandle pipe);
 
 namespace mojo {
 namespace shell {
 
-class ServiceManager::Service : public ShellStub {
+class ServiceManager::Service : public Shell {
  public:
   Service(ServiceManager* manager, const GURL& url)
       : manager_(manager),
         url_(url) {
     MessagePipe pipe;
-    shell_client_.reset(pipe.handle0.Pass());
-    shell_client_.SetPeer(this);
+    shell_client_.reset(pipe.handle0.Pass(), this);
     manager_->GetLoaderForURL(url)->Load(url, manager_, pipe.handle1.Pass());
   }
 
   virtual ~Service() {}
 
   void ConnectToClient(ScopedMessagePipeHandle handle) {
     if (handle.is_valid())
       shell_client_->AcceptConnection(handle.Pass());
   }
 
@@ skipping 153 matching lines @@
     service = service_it->second;
   } else {
     service = new Service(this, url);
     url_to_service_[url] = service;
   }
   service->ConnectToClient(client_handle.Pass());
 }
 
 }  // namespace shell
 }  // namespace mojo