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

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_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/conflict_resolver_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index dec53c951bd6d16d41db19d6d02525770a9bc2c1..fe54bdc4ba76fb6baa252f1e17e2f7cc0060ac51 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/files/file_util.h"
@@ -69,12 +71,10 @@ class ConflictResolverTest : public testing::Test {
kSyncRootFolderTitle));
remote_change_processor_.reset(new FakeRemoteChangeProcessor);
- context_.reset(new SyncEngineContext(fake_drive_service.Pass(),
- drive_uploader.Pass(),
- nullptr /* task_logger */,
- base::ThreadTaskRunnerHandle::Get(),
- base::ThreadTaskRunnerHandle::Get(),
- nullptr /* worker_pool */));
+ context_.reset(new SyncEngineContext(
+ std::move(fake_drive_service), std::move(drive_uploader),
+ nullptr /* task_logger */, base::ThreadTaskRunnerHandle::Get(),
+ base::ThreadTaskRunnerHandle::Get(), nullptr /* worker_pool */));
context_->SetRemoteChangeProcessor(remote_change_processor_.get());
RegisterSyncableFileSystem();
@@ -248,7 +248,7 @@ class ConflictResolverTest : public testing::Test {
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_helper_->SearchByTitle(
parent_folder_id, title, &entries));
- return entries.Pass();
+ return entries;
}
void VerifyConflictResolution(

Powered by Google App Engine
This is Rietveld 408576698