Index: mojo/shell/service_manager.cc |
diff --git a/mojo/shell/service_manager.cc b/mojo/shell/service_manager.cc |
index cb774ae0bdbdbe60866483ff78e5993be97f1d58..4e95bec41bb1b7e3b67c0df50f281332a56e22f3 100644 |
--- a/mojo/shell/service_manager.cc |
+++ b/mojo/shell/service_manager.cc |
@@ -20,14 +20,13 @@ 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()); |
} |