Eliminate MojoApplicationHost

services/shell/public/cpp/interface_provider.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_PROVIDER_H_
 #define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_PROVIDER_H_
 
 #include "services/shell/public/interfaces/interface_provider.mojom.h"
 
 namespace shell {
@@ skipping 20 matching lines @@
 
     void ClearBinders() {
       provider_->ClearBinders();
     }
 
    private:
     InterfaceProvider* provider_;
     DISALLOW_COPY_AND_ASSIGN(TestApi);
   };
 
-  explicit InterfaceProvider(mojom::InterfaceProviderPtr interface_provider);
+  InterfaceProvider();
   ~InterfaceProvider();
 
+  void Bind(mojom::InterfaceProviderPtr interface_provider);
+
   // Returns a raw pointer to the remote InterfaceProvider.
   mojom::InterfaceProvider* get() { return interface_provider_.get(); }
 
   // Sets a closure to be run when the remote InterfaceProvider pipe is closed.
   void SetConnectionLostClosure(const base::Closure& connection_lost_closure);
 
   base::WeakPtr<InterfaceProvider> GetWeakPtr();
 
   // Binds |ptr| to an implementation of Interface in the remote application.
   // |ptr| can immediately be used to start sending requests to the remote
@@ skipping 18 matching lines @@
       const base::Callback<void(mojo::ScopedMessagePipeHandle)>& binder) {
     binders_[name] = binder;
   }
   void ClearBinders();
 
   using BinderMap = std::map<
       std::string, base::Callback<void(mojo::ScopedMessagePipeHandle)>>;
   BinderMap binders_;
 
   mojom::InterfaceProviderPtr interface_provider_;
+  mojom::InterfaceProviderRequest pending_request_;
 
   base::WeakPtrFactory<InterfaceProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceProvider);
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_PROVIDER_H_