Eliminate MojoApplicationHost

content/browser/frame_host/render_frame_host_impl.cc

Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1f11c56e75f519c9c7122a5caf842319156c81f9..b64a24acd1d04ddff0257585e1dd76c37b67f7ed 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2394,13 +2394,12 @@ void RenderFrameHostImpl::SetUpMojoIfNeeded() {
     return;
 
   interface_registry_.reset(new shell::InterfaceRegistry(nullptr));
-  if (!GetProcess()->GetServiceRegistry())
+  if (!GetProcess()->GetRemoteInterfaces())
     return;
 
   RegisterMojoInterfaces();
   mojom::FrameFactoryPtr frame_factory;
-  GetProcess()->GetServiceRegistry()->ConnectToRemoteService(
-      mojo::GetProxy(&frame_factory));
+  GetProcess()->GetRemoteInterfaces()->GetInterface(&frame_factory);
 
   frame_factory->CreateFrame(routing_id_, GetProxy(&frame_),
                              frame_host_binding_.CreateInterfacePtrAndBind());
@@ -2409,8 +2408,8 @@ void RenderFrameHostImpl::SetUpMojoIfNeeded() {
   shell::mojom::InterfaceProviderPtr remote_interfaces;
   shell::mojom::InterfaceProviderRequest remote_interfaces_request =
       GetProxy(&remote_interfaces);
-  remote_interfaces_.reset(
-      new shell::InterfaceProvider(std::move(remote_interfaces)));
+  remote_interfaces_.reset(new shell::InterfaceProvider);
+  remote_interfaces_->Bind(std::move(remote_interfaces));
   frame_->GetInterfaceProvider(std::move(remote_interfaces_request));
 
 #if defined(OS_ANDROID)