Remove Client relationship between mojo.Shell/mojo.Application

shell/external_application_listener.cc

 // Copyright 2014 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.
 
 #include "shell/external_application_listener.h"
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ skipping 32 matching lines @@
   ~RegistrarImpl() override;
 
   void OnConnectionError() override;
 
   embedder::ChannelInit channel_init;
 
  private:
   virtual void Register(
       const String& app_url,
       Array<String> args,
-      const mojo::Callback<void(ShellPtr)>& callback) override;
+      const mojo::Callback<void(InterfaceRequest<Application>)>& callback)
+      override;
 
   const RegisterCallback register_callback_;
 };
 
 ExternalApplicationListener::ExternalApplicationListener(
     const scoped_refptr<base::SequencedTaskRunner>& shell_runner,
     const scoped_refptr<base::SequencedTaskRunner>& io_runner)
     : shell_runner_(shell_runner),
       io_runner_(io_runner),
       signal_on_listening_(true, false),
@@ skipping 103 matching lines @@
 ExternalApplicationListener::RegistrarImpl::~RegistrarImpl() {
 }
 
 void ExternalApplicationListener::RegistrarImpl::OnConnectionError() {
   channel_init.WillDestroySoon();
 }
 
 void ExternalApplicationListener::RegistrarImpl::Register(
     const String& app_url,
     Array<String> args,
-    const mojo::Callback<void(ShellPtr)>& callback) {
-  MessagePipe pipe;
+    const mojo::Callback<void(InterfaceRequest<Application>)>& callback) {
+  ApplicationPtr application;
+  InterfaceRequest<Application> application_request = GetProxy(&application);
   register_callback_.Run(app_url.To<GURL>(),
                          args.To<std::vector<std::string>>(),
-                         pipe.handle0.Pass());
-  callback.Run(MakeProxy<Shell>(pipe.handle1.Pass()));
+                         application.Pass());
+  callback.Run(application_request.Pass());
 }
 
 }  // namespace shell
 }  // namespace mojo