Remove Client relationship between mojo.Shell/mojo.Application

shell/launcher_main.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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 24 matching lines @@
   bool Connect() { return connection_.Connect(); }
 
   bool Register() {
     DCHECK(!run_loop_.get());
     run_loop_.reset(new base::RunLoop);
     connection_.Register(
         app_url_, app_args_,
         base::Bind(&Launcher::OnRegistered, base::Unretained(this)));
     run_loop_->Run();
     run_loop_.reset();
-    return shell_handle_.is_valid();
+    return application_request_.is_pending();
   }
 
   void Run() {
     DCHECK(!run_loop_.get());
-    DCHECK(shell_handle_.is_valid());
+    DCHECK(application_request_.is_pending());
     mojo::shell::InProcessDynamicServiceRunner service_runner(nullptr);
     run_loop_.reset(new base::RunLoop);
     service_runner.Start(
-        app_path_, shell_handle_.Pass(),
+        app_path_, application_request_.Pass(),
         base::Bind(&Launcher::OnAppCompleted, base::Unretained(this)));
     run_loop_->Run();
     run_loop_.reset();
   }
 
  private:
-  void OnRegistered(mojo::ShellPtr shell) {
-    shell_handle_ = shell.PassMessagePipe();
+  void OnRegistered(
+      mojo::InterfaceRequest<mojo::Application> application_request) {
+    application_request_ = application_request.Pass();
     run_loop_->Quit();
   }
 
   void OnAppCompleted() { run_loop_->Quit(); }
 
   const base::FilePath app_path_;
   const GURL app_url_;
   std::vector<std::string> app_args_;
   base::MessageLoop loop_;
   mojo::shell::ExternalApplicationRegistrarConnection connection_;
-  mojo::ScopedMessagePipeHandle shell_handle_;
+  mojo::InterfaceRequest<mojo::Application> application_request_;
   scoped_ptr<base::RunLoop> run_loop_;
 };
 
 #if defined(OS_WIN)
 int main(int argc, wchar_t** argv) {
 #else
 int main(int argc, char** argv) {
 #endif
   base::AtExitManager at_exit;
   mojo::embedder::Init(scoped_ptr<mojo::embedder::PlatformSupport>(
@@ skipping 12 matching lines @@
 
   if (!launcher.Register()) {
     LOG(ERROR) << "Error registering "
                << command_line->GetSwitchValueASCII(kAppURL);
     return MOJO_RESULT_INVALID_ARGUMENT;
   }
 
   launcher.Run();
   return MOJO_RESULT_OK;
 }