| Index: chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
|
| index 1eff6c515d95435e4e8a74ecedbec4d2beafcb57..624cefc32fbbb6d74c99ce75d899fd2235d98c11 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
|
| @@ -68,16 +68,18 @@ SyncTaskToken::~SyncTaskToken() {
|
| // it must return the token to TaskManager.
|
| // Destroying a token with valid |client| indicates the token was
|
| // dropped by a task without returning.
|
| - if (task_runner_ && task_runner_->RunsTasksOnCurrentThread() &&
|
| + if (task_runner_.get() && task_runner_->RunsTasksOnCurrentThread() &&
|
| manager_ && manager_->IsRunningTask(token_id_)) {
|
| NOTREACHED()
|
| << "Unexpected TaskToken deletion from: " << location_.ToString();
|
|
|
| // Reinitializes the token.
|
| SyncTaskManager::NotifyTaskDone(
|
| - make_scoped_ptr(new SyncTaskToken(
|
| - manager_, task_runner_, token_id_, blocking_factor_.Pass(),
|
| - SyncStatusCallback())),
|
| + make_scoped_ptr(new SyncTaskToken(manager_,
|
| + task_runner_.get(),
|
| + token_id_,
|
| + blocking_factor_.Pass(),
|
| + SyncStatusCallback())),
|
| SYNC_STATUS_OK);
|
| }
|
| }
|
|
|