Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4029)

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc

Issue 1545283002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
index c7ee44e88c99ec476a64aa489cd7e46250e318ce..ccf36167451016ac9d9f6958af81041f0fae29d4 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include <stdint.h>
+#include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
+#include <stdint.h>
#include <deque>
#include <string>
+#include <utility>
#include "base/bind.h"
#include "base/location.h"
@@ -16,7 +18,6 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
-#include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"
#include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"
#include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
#include "storage/common/fileapi/file_system_util.h"
@@ -198,7 +199,7 @@ class BackgroundTask : public SyncTask {
task_blocker->paths.push_back(path_);
SyncTaskManager::UpdateTaskBlocker(
- token.Pass(), task_blocker.Pass(),
+ std::move(token), std::move(task_blocker),
base::Bind(&BackgroundTask::RunAsBackgroundTask,
weak_ptr_factory_.GetWeakPtr()));
}
@@ -218,7 +219,7 @@ class BackgroundTask : public SyncTask {
void CompleteTask(scoped_ptr<SyncTaskToken> token) {
++(stats_->finished_task);
--(stats_->running_background_task);
- SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
+ SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_OK);
}
std::string app_id_;
@@ -248,14 +249,14 @@ class BlockerUpdateTestHelper : public SyncTask {
~BlockerUpdateTestHelper() override {}
void RunPreflight(scoped_ptr<SyncTaskToken> token) override {
- UpdateBlocker(token.Pass());
+ UpdateBlocker(std::move(token));
}
private:
void UpdateBlocker(scoped_ptr<SyncTaskToken> token) {
if (paths_.empty()) {
log_->push_back(name_ + ": finished");
- SyncTaskManager::NotifyTaskDone(token.Pass(), SYNC_STATUS_OK);
+ SyncTaskManager::NotifyTaskDone(std::move(token), SYNC_STATUS_OK);
return;
}
@@ -271,10 +272,9 @@ class BlockerUpdateTestHelper : public SyncTask {
base::FilePath::FromUTF8Unsafe(updating_to))));
SyncTaskManager::UpdateTaskBlocker(
- token.Pass(), task_blocker.Pass(),
+ std::move(token), std::move(task_blocker),
base::Bind(&BlockerUpdateTestHelper::UpdateBlockerSoon,
- weak_ptr_factory_.GetWeakPtr(),
- updating_to));
+ weak_ptr_factory_.GetWeakPtr(), updating_to));
}
void UpdateBlockerSoon(const std::string& updated_to,

Powered by Google App Engine
This is Rietveld 408576698