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

chrome/browser/sync_file_system/drive_backend/sync_task_token.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_token.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
 #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h"
 
 namespace sync_file_system {
 namespace drive_backend {
 
 const int64_t SyncTaskToken::kTestingTaskTokenID = -1;
@@ skipping 22 matching lines @@
       nullptr,  // task_blocker
       SyncStatusCallback()));
 }
 
 // static
 scoped_ptr<SyncTaskToken> SyncTaskToken::CreateForBackgroundTask(
     const base::WeakPtr<SyncTaskManager>& manager,
     base::SequencedTaskRunner* task_runner,
     int64_t token_id,
     scoped_ptr<TaskBlocker> task_blocker) {
-  return make_scoped_ptr(new SyncTaskToken(
-      manager,
-      task_runner,
-      token_id,
-      task_blocker.Pass(),
-      SyncStatusCallback()));
+  return make_scoped_ptr(new SyncTaskToken(manager, task_runner, token_id,
+                                           std::move(task_blocker),
+                                           SyncStatusCallback()));
 }
 
 void SyncTaskToken::UpdateTask(const tracked_objects::Location& location,
                                const SyncStatusCallback& callback) {
   DCHECK(callback_.is_null());
   location_ = location;
   callback_ = callback;
   DVLOG(2) << "Token updated: " << location_.ToString();
 }
 
 SyncTaskToken::~SyncTaskToken() {
   // All task on Client must hold TaskToken instance to ensure
   // no other tasks are running. Also, as soon as a task finishes to work,
   // 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_.get() && task_runner_->RunsTasksOnCurrentThread() &&
       manager_ && manager_->IsRunningTask(token_id_)) {
     if (!manager_->ShouldTrackTaskToken())
       return;
 
     NOTREACHED()
         << "Unexpected TaskToken deletion from: " << location_.ToString();
 
     // Reinitializes the token.
     SyncTaskManager::NotifyTaskDone(
-        make_scoped_ptr(new SyncTaskToken(manager_,
-                                          task_runner_.get(),
-                                          token_id_,
-                                          task_blocker_.Pass(),
+        make_scoped_ptr(new SyncTaskToken(manager_, task_runner_.get(),
+                                          token_id_, std::move(task_blocker_),
                                           SyncStatusCallback())),
         SYNC_STATUS_OK);
   }
 }
 
 // static
 SyncStatusCallback SyncTaskToken::WrapToCallback(
     scoped_ptr<SyncTaskToken> token) {
   return base::Bind(&SyncTaskManager::NotifyTaskDone, base::Passed(&token));
 }
 
 void SyncTaskToken::set_task_blocker(
     scoped_ptr<TaskBlocker> task_blocker) {
-  task_blocker_ = task_blocker.Pass();
+  task_blocker_ = std::move(task_blocker);
 }
 
 const TaskBlocker* SyncTaskToken::task_blocker() const {
   return task_blocker_.get();
 }
 
 void SyncTaskToken::clear_task_blocker() {
   task_blocker_.reset();
 }
 
@@ skipping 18 matching lines @@
   task_log_->result_description = result_description;
   task_log_->end_time = base::TimeTicks::Now();
 }
 
 void SyncTaskToken::RecordLog(const std::string& message) {
   DCHECK(task_log_);
   task_log_->details.push_back(message);
 }
 
 void SyncTaskToken::SetTaskLog(scoped_ptr<TaskLogger::TaskLog> task_log) {
-  task_log_ = task_log.Pass();
+  task_log_ = std::move(task_log);
 }
 
 scoped_ptr<TaskLogger::TaskLog> SyncTaskToken::PassTaskLog() {
-  return task_log_.Pass();
+  return std::move(task_log_);
 }
 
 SyncTaskToken::SyncTaskToken(
     const base::WeakPtr<SyncTaskManager>& manager,
     const scoped_refptr<base::SequencedTaskRunner>& task_runner,
     int64_t token_id,
     scoped_ptr<TaskBlocker> task_blocker,
     const SyncStatusCallback& callback)
     : manager_(manager),
       task_runner_(task_runner),
       token_id_(token_id),
       callback_(callback),
-      task_blocker_(task_blocker.Pass()) {}
+      task_blocker_(std::move(task_blocker)) {}
 
 }  // namespace drive_backend
 }  // namespace sync_file_system