Index: shell/android/background_application_loader.cc |
diff --git a/shell/android/background_application_loader.cc b/shell/android/background_application_loader.cc |
index 0f72c3c496144f355d84197377e1290caba99034..5a84ccbe5314d195ccabd55ec4d35d37e4b6e6ad 100644 |
--- a/shell/android/background_application_loader.cc |
+++ b/shell/android/background_application_loader.cc |
@@ -27,9 +27,9 @@ BackgroundApplicationLoader::~BackgroundApplicationLoader() { |
void BackgroundApplicationLoader::Load(ApplicationManager* manager, |
const GURL& url, |
- ScopedMessagePipeHandle shell_handle, |
+ ShellPtr shell, |
LoadCallback callback) { |
- DCHECK(shell_handle.is_valid()); |
+ DCHECK(shell); |
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 |
@@ -46,8 +46,7 @@ void BackgroundApplicationLoader::Load(ApplicationManager* manager, |
task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&BackgroundApplicationLoader::LoadOnBackgroundThread, |
- base::Unretained(this), manager, url, |
- base::Passed(&shell_handle))); |
+ base::Unretained(this), manager, url, base::Passed(&shell))); |
} |
void BackgroundApplicationLoader::OnApplicationError( |
@@ -75,9 +74,9 @@ void BackgroundApplicationLoader::Run() { |
void BackgroundApplicationLoader::LoadOnBackgroundThread( |
ApplicationManager* manager, |
const GURL& url, |
- ScopedMessagePipeHandle shell_handle) { |
+ ShellPtr shell) { |
DCHECK(task_runner_->RunsTasksOnCurrentThread()); |
- loader_->Load(manager, url, shell_handle.Pass(), SimpleLoadCallback()); |
+ loader_->Load(manager, url, shell.Pass(), SimpleLoadCallback()); |
} |
void BackgroundApplicationLoader::OnApplicationErrorOnBackgroundThread( |