| Index: content/browser/webui/web_ui_mojo_browsertest.cc
|
| diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
|
| index 6261316ab115d4cd2d9da02de1f60c54341da51a..ebb5bb1b90a35dd57c7615146caebbdd5dc4ccd9 100644
|
| --- a/content/browser/webui/web_ui_mojo_browsertest.cc
|
| +++ b/content/browser/webui/web_ui_mojo_browsertest.cc
|
| @@ -59,10 +59,10 @@ bool GetResource(const std::string& id,
|
|
|
| class BrowserTargetImpl : public BrowserTarget {
|
| public:
|
| - BrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
|
| + BrowserTargetImpl(mojo::InterfaceRequest<BrowserTarget> request,
|
| base::RunLoop* run_loop)
|
| : run_loop_(run_loop) {
|
| - renderer_.Bind(handle.Pass());
|
| + renderer_.Bind(request.PassMessagePipe());
|
| renderer_.set_client(this);
|
| }
|
|
|
| @@ -83,9 +83,9 @@ class BrowserTargetImpl : public BrowserTarget {
|
|
|
| class PingBrowserTargetImpl : public BrowserTargetImpl {
|
| public:
|
| - PingBrowserTargetImpl(mojo::ScopedMessagePipeHandle handle,
|
| + PingBrowserTargetImpl(mojo::InterfaceRequest<BrowserTarget> request,
|
| base::RunLoop* run_loop)
|
| - : BrowserTargetImpl(handle.Pass(), run_loop) {
|
| + : BrowserTargetImpl(request.Pass(), run_loop) {
|
| renderer_->Ping();
|
| }
|
|
|
| @@ -133,14 +133,14 @@ class PingTestWebUIController : public TestWebUIController {
|
|
|
| // WebUIController overrides:
|
| virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE {
|
| - render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
|
| - "webui_controller",
|
| - base::Bind(&PingTestWebUIController::CreateHandler,
|
| - base::Unretained(this)));
|
| + render_view_host->GetMainFrame()
|
| + ->GetServiceRegistry()
|
| + ->AddService<BrowserTarget>(base::Bind(
|
| + &PingTestWebUIController::CreateHandler, base::Unretained(this)));
|
| }
|
|
|
| - void CreateHandler(mojo::ScopedMessagePipeHandle handle) {
|
| - browser_target_.reset(new PingBrowserTargetImpl(handle.Pass(), run_loop_));
|
| + void CreateHandler(mojo::InterfaceRequest<BrowserTarget> request) {
|
| + browser_target_.reset(new PingBrowserTargetImpl(request.Pass(), run_loop_));
|
| }
|
|
|
| private:
|
|
|