Remove Client relationship between mojo.Shell/mojo.Application

shell/android/background_application_loader.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/android/background_application_loader.h"
 
 #include "base/bind.h"
 #include "base/run_loop.h"
 #include "shell/application_manager/application_manager.h"
 
 namespace mojo {
 
 BackgroundApplicationLoader::BackgroundApplicationLoader(
     scoped_ptr<ApplicationLoader> real_loader,
     const std::string& thread_name,
     base::MessageLoop::Type message_loop_type)
     : loader_(real_loader.Pass()),
       message_loop_type_(message_loop_type),
       thread_name_(thread_name),
       message_loop_created_(true, false) {
 }
 
 BackgroundApplicationLoader::~BackgroundApplicationLoader() {
   if (thread_)
     thread_->Join();
 }
 
-void BackgroundApplicationLoader::Load(ApplicationManager* manager,
-                                       const GURL& url,
-                                       ShellPtr shell,
-                                       LoadCallback callback) {
-  DCHECK(shell);
+void BackgroundApplicationLoader::Load(
+    ApplicationManager* manager,
+    const GURL& url,
+    InterfaceRequest<Application> application_request,
+    LoadCallback callback) {
+  DCHECK(application_request.is_pending());
   if (!thread_) {
     // TODO(tim): It'd be nice if we could just have each Load call
     // result in a new thread like DynamicService{Loader, Runner}. But some
     // loaders are creating multiple ApplicationImpls (NetworkApplicationLoader)
     // sharing a delegate (etc). So we have to keep it single threaded, wait
     // for the thread to initialize, and post to the TaskRunner for subsequent
     // Load calls for now.
     thread_.reset(new base::DelegateSimpleThread(this, thread_name_));
     thread_->Start();
     message_loop_created_.Wait();
     DCHECK(task_runner_.get());
   }
 
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&BackgroundApplicationLoader::LoadOnBackgroundThread,
-                 base::Unretained(this), manager, url, base::Passed(&shell)));
+                 base::Unretained(this), manager, url,
+                 base::Passed(&application_request)));
 }
 
 void BackgroundApplicationLoader::OnApplicationError(
     ApplicationManager* manager,
     const GURL& url) {
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &BackgroundApplicationLoader::OnApplicationErrorOnBackgroundThread,
           base::Unretained(this), manager, url));
 }
 
 void BackgroundApplicationLoader::Run() {
   base::MessageLoop message_loop(message_loop_type_);
   base::RunLoop loop;
   task_runner_ = message_loop.task_runner();
   quit_closure_ = loop.QuitClosure();
   message_loop_created_.Signal();
   loop.Run();
 
   // Destroy |loader_| on the thread it's actually used on.
   loader_.reset();
 }
 
 void BackgroundApplicationLoader::LoadOnBackgroundThread(
     ApplicationManager* manager,
     const GURL& url,
-    ShellPtr shell) {
+    InterfaceRequest<Application> application_request) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
-  loader_->Load(manager, url, shell.Pass(), SimpleLoadCallback());
+  loader_->Load(manager, url, application_request.Pass(), SimpleLoadCallback());
 }
 
 void BackgroundApplicationLoader::OnApplicationErrorOnBackgroundThread(
     ApplicationManager* manager,
     const GURL& url) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   loader_->OnApplicationError(manager, url);
 }
 
 }  // namespace mojo