Convert Pass()→std::move() in //chrome/browser/ui

chrome/browser/sync_file_system/drive_backend/sync_task_manager.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 "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"
 #include "chrome/browser/sync_file_system/sync_file_metadata.h"
 
 using storage::FileSystemURL;
@@ skipping 88 matching lines @@
 
   scoped_ptr<SyncTaskToken> token(GetToken(from_here, callback));
   if (!token) {
     PushPendingTask(
         base::Bind(&SyncTaskManager::ScheduleSyncTask,
                    weak_ptr_factory_.GetWeakPtr(), from_here,
                    base::Passed(&task), priority, callback),
         priority);
     return;
   }
-  RunTask(token.Pass(), task.Pass());
+  RunTask(std::move(token), std::move(task));
 }
 
 bool SyncTaskManager::ScheduleTaskIfIdle(
         const tracked_objects::Location& from_here,
         const Task& task,
         const SyncStatusCallback& callback) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   return ScheduleSyncTaskIfIdle(
       from_here,
       scoped_ptr<SyncTask>(new SyncTaskAdapter(task)),
       callback);
 }
 
 bool SyncTaskManager::ScheduleSyncTaskIfIdle(
     const tracked_objects::Location& from_here,
     scoped_ptr<SyncTask> task,
     const SyncStatusCallback& callback) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   scoped_ptr<SyncTaskToken> token(GetToken(from_here, callback));
   if (!token)
     return false;
-  RunTask(token.Pass(), task.Pass());
+  RunTask(std::move(token), std::move(task));
   return true;
 }
 
 // static
 void SyncTaskManager::NotifyTaskDone(scoped_ptr<SyncTaskToken> token,
                                      SyncStatusCode status) {
   DCHECK(token);
 
   SyncTaskManager* manager = token->manager();
   if (token->token_id() == SyncTaskToken::kTestingTaskTokenID) {
     DCHECK(!manager);
     SyncStatusCallback callback = token->callback();
     token->clear_callback();
     callback.Run(status);
     return;
   }
 
   if (manager)
-    manager->NotifyTaskDoneBody(token.Pass(), status);
+    manager->NotifyTaskDoneBody(std::move(token), status);
 }
 
 // static
 void SyncTaskManager::UpdateTaskBlocker(
     scoped_ptr<SyncTaskToken> current_task_token,
     scoped_ptr<TaskBlocker> task_blocker,
     const Continuation& continuation) {
   DCHECK(current_task_token);
 
   SyncTaskManager* manager = current_task_token->manager();
   if (current_task_token->token_id() == SyncTaskToken::kTestingTaskTokenID) {
     DCHECK(!manager);
-    continuation.Run(current_task_token.Pass());
+    continuation.Run(std::move(current_task_token));
     return;
   }
 
   if (!manager)
     return;
 
   scoped_ptr<SyncTaskToken> foreground_task_token;
   scoped_ptr<SyncTaskToken> background_task_token;
   scoped_ptr<TaskLogger::TaskLog> task_log = current_task_token->PassTaskLog();
   if (current_task_token->token_id() == SyncTaskToken::kForegroundTaskTokenID)
-    foreground_task_token = current_task_token.Pass();
+    foreground_task_token = std::move(current_task_token);
   else
-    background_task_token = current_task_token.Pass();
+    background_task_token = std::move(current_task_token);
 
-  manager->UpdateTaskBlockerBody(foreground_task_token.Pass(),
-                                 background_task_token.Pass(),
-                                 task_log.Pass(),
-                                 task_blocker.Pass(),
-                                 continuation);
+  manager->UpdateTaskBlockerBody(
+      std::move(foreground_task_token), std::move(background_task_token),
+      std::move(task_log), std::move(task_blocker), continuation);
 }
 
 bool SyncTaskManager::IsRunningTask(int64_t token_id) const {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   // If the client is gone, all task should be aborted.
   if (!client_)
     return false;
 
   if (token_id == SyncTaskToken::kForegroundTaskTokenID)
@@ skipping 28 matching lines @@
     if (token->has_task_log()) {
       token->FinalizeTaskLog(SyncStatusCodeToString(status));
       client_->RecordTaskLog(token->PassTaskLog());
     }
   }
 
   scoped_ptr<SyncTask> task;
   SyncStatusCallback callback = token->callback();
   token->clear_callback();
   if (token->token_id() == SyncTaskToken::kForegroundTaskTokenID) {
-    token_ = token.Pass();
-    task = running_foreground_task_.Pass();
+    token_ = std::move(token);
+    task = std::move(running_foreground_task_);
   } else {
     task = running_background_tasks_.take_and_erase(token->token_id());
   }
 
   // Acquire the token to prevent a new task to jump into the queue.
-  token = token_.Pass();
+  token = std::move(token_);
 
   bool task_used_network = false;
   if (task)
     task_used_network = task->used_network();
 
   if (client_)
     client_->NotifyLastOperationStatus(status, task_used_network);
 
   if (!callback.is_null())
     callback.Run(status);
@@ skipping 11 matching lines @@
     scoped_ptr<SyncTaskToken> background_task_token,
     scoped_ptr<TaskLogger::TaskLog> task_log,
     scoped_ptr<TaskBlocker> task_blocker,
     const Continuation& continuation) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   // Run the task directly if the parallelization is disabled.
   if (!maximum_background_task_) {
     DCHECK(foreground_task_token);
     DCHECK(!background_task_token);
-    foreground_task_token->SetTaskLog(task_log.Pass());
-    continuation.Run(foreground_task_token.Pass());
+    foreground_task_token->SetTaskLog(std::move(task_log));
+    continuation.Run(std::move(foreground_task_token));
     return;
   }
 
   // Clear existing |task_blocker| from |dependency_manager_| before
   // getting |foreground_task_token|, so that we can avoid dead lock.
   if (background_task_token && background_task_token->task_blocker()) {
     dependency_manager_.Erase(background_task_token->task_blocker());
     background_task_token->clear_task_blocker();
   }
 
@@ skipping 35 matching lines @@
                    weak_ptr_factory_.GetWeakPtr(),
                    base::Passed(&foreground_task_token),
                    base::Passed(&background_task_token),
                    base::Passed(&task_log),
                    base::Passed(&task_blocker),
                    continuation);
     return;
   }
 
   if (background_task_token) {
-    background_task_token->set_task_blocker(task_blocker.Pass());
+    background_task_token->set_task_blocker(std::move(task_blocker));
   } else {
     tracked_objects::Location from_here = foreground_task_token->location();
     SyncStatusCallback callback = foreground_task_token->callback();
     foreground_task_token->clear_callback();
 
-    background_task_token =
-        SyncTaskToken::CreateForBackgroundTask(weak_ptr_factory_.GetWeakPtr(),
-                                               task_runner_.get(),
-                                               task_token_seq_++,
-                                               task_blocker.Pass());
+    background_task_token = SyncTaskToken::CreateForBackgroundTask(
+        weak_ptr_factory_.GetWeakPtr(), task_runner_.get(), task_token_seq_++,
+        std::move(task_blocker));
     background_task_token->UpdateTask(from_here, callback);
     running_background_tasks_.set(background_task_token->token_id(),
-                                  running_foreground_task_.Pass());
+                                  std::move(running_foreground_task_));
   }
 
-  token_ = foreground_task_token.Pass();
+  token_ = std::move(foreground_task_token);
   MaybeStartNextForegroundTask(nullptr);
-  background_task_token->SetTaskLog(task_log.Pass());
-  continuation.Run(background_task_token.Pass());
+  background_task_token->SetTaskLog(std::move(task_log));
+  continuation.Run(std::move(background_task_token));
 }
 
 scoped_ptr<SyncTaskToken> SyncTaskManager::GetToken(
     const tracked_objects::Location& from_here,
     const SyncStatusCallback& callback) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   if (!token_)
     return nullptr;
   token_->UpdateTask(from_here, callback);
-  return token_.Pass();
+  return std::move(token_);
 }
 
 void SyncTaskManager::PushPendingTask(
     const base::Closure& closure, Priority priority) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   pending_tasks_.push(PendingTask(closure, priority, pending_task_seq_++));
 }
 
 void SyncTaskManager::RunTask(scoped_ptr<SyncTaskToken> token,
                               scoped_ptr<SyncTask> task) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(!running_foreground_task_);
 
-  running_foreground_task_ = task.Pass();
-  running_foreground_task_->RunPreflight(token.Pass());
+  running_foreground_task_ = std::move(task);
+  running_foreground_task_->RunPreflight(std::move(token));
 }
 
 void SyncTaskManager::MaybeStartNextForegroundTask(
     scoped_ptr<SyncTaskToken> token) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   if (token) {
     DCHECK(!token_);
-    token_ = token.Pass();
+    token_ = std::move(token);
   }
 
   if (!pending_backgrounding_task_.is_null()) {
     base::Closure closure = pending_backgrounding_task_;
     pending_backgrounding_task_.Reset();
     closure.Run();
     return;
   }
 
   if (!token_)
     return;
 
   if (!pending_tasks_.empty()) {
     base::Closure closure = pending_tasks_.top().task;
     pending_tasks_.pop();
     closure.Run();
     return;
   }
 
   if (client_)
     client_->MaybeScheduleNextTask();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system