From e3fe2a2fcccb8f281ebbca257bd1e6cb5642105e Mon Sep 17 00:00:00 2001
From: yzshen <yzshen@chromium.org>
Date: Mon, 4 May 2015 14:47:01 -0700
Subject: [PATCH] Remove some InterfacePtr<> methods which directly deal with
 message pipe handles.

Users should use the corresponding methods dealing with
InterfacePtrInfo<>.

BUG=None
TEST=None
R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/1118843003
---
 engine/core/html/HTMLIFrameElement.cpp | 12 +++++++-----
 shell/ui/engine.cc                     |  3 ++-
 shell/ui/internals.cc                  |  2 +-
 viewer/document_view.cc                |  4 ++--
 viewer/internals.cc                    |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/engine/core/html/HTMLIFrameElement.cpp b/engine/core/html/HTMLIFrameElement.cpp
index edbbc748a..c22e5bb12 100644
--- a/engine/core/html/HTMLIFrameElement.cpp
+++ b/engine/core/html/HTMLIFrameElement.cpp
@@ -82,11 +82,13 @@ PassRefPtr<DartValue> HTMLIFrameElement::takeExposedServicesHandle(DartState*)
 
 void HTMLIFrameElement::embedViewManagerClient(RefPtr<DartValue> client)
 {
-  if (!m_contentView)
-    return;
+    if (!m_contentView)
+        return;
 
-  m_contentView->Embed(mojo::MakeProxy<mojo::ViewManagerClient>(
-      DartConverter<mojo::ScopedMessagePipeHandle>::FromDart(client->dart_value())));
+    mojo::ScopedMessagePipeHandle handle = DartConverter<mojo::ScopedMessagePipeHandle>::FromDart(client->dart_value());
+    mojo::ViewManagerClientPtr client_ptr = mojo::MakeProxy(
+        mojo::InterfacePtrInfo<mojo::ViewManagerClient>(handle.Pass(), 0u));
+    m_contentView->Embed(client_ptr.Pass());
 }
 
 void HTMLIFrameElement::navigateView()
@@ -105,7 +107,7 @@ void HTMLIFrameElement::navigateView()
 
     m_contentView->Embed(mojo::String::From(url.string().utf8().data()),
         mojo::GetProxy(&m_services),
-        mojo::MakeProxy<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass()));
+        mojo::MakeProxy(mojo::InterfacePtrInfo<mojo::ServiceProvider>(exposedServicesPipe.handle1.Pass(), 0u)));
 }
 
 }
diff --git a/shell/ui/engine.cc b/shell/ui/engine.cc
index 7f906a166..df145d617 100644
--- a/shell/ui/engine.cc
+++ b/shell/ui/engine.cc
@@ -58,7 +58,8 @@ mojo::ServiceProviderPtr Engine::CreateServiceProvider() {
       base::Bind(CreateJavaServiceProvider,
                  base::Passed(mojo::MakeRequest<mojo::ServiceProvider>(
                      pipe.handle1.Pass()))));
-  return mojo::MakeProxy<mojo::ServiceProvider>(pipe.handle0.Pass());
+  return mojo::MakeProxy(
+      mojo::InterfacePtrInfo<mojo::ServiceProvider>(pipe.handle0.Pass(), 0u));
 }
 
 void Engine::Init() {
diff --git a/shell/ui/internals.cc b/shell/ui/internals.cc
index b32a81d18..f6049e672 100644
--- a/shell/ui/internals.cc
+++ b/shell/ui/internals.cc
@@ -77,7 +77,7 @@ Internals::~Internals() {
 }
 
 mojo::Handle Internals::TakeServicesProvidedByEmbedder() {
-  return service_provider_.PassMessagePipe().release();
+  return service_provider_.PassInterface().PassHandle().release();
 }
 
 }  // namespace shell
diff --git a/viewer/document_view.cc b/viewer/document_view.cc
index bd360b769..510c8d4bd 100644
--- a/viewer/document_view.cc
+++ b/viewer/document_view.cc
@@ -198,11 +198,11 @@ mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedToEmbedder() {
 }
 
 mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedByEmbedder() {
-  return services_provided_by_embedder_.PassMessagePipe();
+  return services_provided_by_embedder_.PassInterface().PassHandle();
 }
 
 mojo::ScopedMessagePipeHandle DocumentView::TakeServiceRegistry() {
-  return service_registry_.PassMessagePipe();
+  return service_registry_.PassInterface().PassHandle();
 }
 
 mojo::Shell* DocumentView::GetShell() {
diff --git a/viewer/internals.cc b/viewer/internals.cc
index cda73c125..1a322669e 100644
--- a/viewer/internals.cc
+++ b/viewer/internals.cc
@@ -172,7 +172,7 @@ mojo::Handle Internals::TakeShellProxyHandle() {
   mojo::ShellPtr shell;
   if (!shell_binding_.is_bound())
     shell_binding_.Bind(GetProxy(&shell));
-  return shell.PassMessagePipe().release();
+  return shell.PassInterface().PassHandle().release();
 }
 
 void Internals::ConnectToApplication(