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

Unified Diff: sync/internal_api/attachments/attachment_service_impl_unittest.cc

Issue 1539843002: Convert Pass()→std::move() in sync/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleaned up 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: sync/internal_api/attachments/attachment_service_impl_unittest.cc
diff --git a/sync/internal_api/attachments/attachment_service_impl_unittest.cc b/sync/internal_api/attachments/attachment_service_impl_unittest.cc
index a044a22fe4c1d021e886b11ec54248dc306f2121..aaf02741930d42da26144e0b74633002257e7ef0 100644
--- a/sync/internal_api/attachments/attachment_service_impl_unittest.cc
+++ b/sync/internal_api/attachments/attachment_service_impl_unittest.cc
@@ -232,7 +232,7 @@ class AttachmentServiceImplTest : public testing::Test,
attachment_store_backend_ = attachment_store_backend->AsWeakPtr();
scoped_ptr<AttachmentStore> attachment_store =
AttachmentStore::CreateMockStoreForTest(
- attachment_store_backend.Pass());
+ std::move(attachment_store_backend));
if (uploader.get()) {
attachment_uploader_ = uploader->AsWeakPtr();
@@ -241,14 +241,14 @@ class AttachmentServiceImplTest : public testing::Test,
attachment_downloader_ = downloader->AsWeakPtr();
}
attachment_service_.reset(new AttachmentServiceImpl(
- attachment_store->CreateAttachmentStoreForSync(), uploader.Pass(),
- downloader.Pass(), delegate, base::TimeDelta::FromMinutes(1),
+ attachment_store->CreateAttachmentStoreForSync(), std::move(uploader),
+ std::move(downloader), delegate, base::TimeDelta::FromMinutes(1),
base::TimeDelta::FromMinutes(8)));
scoped_ptr<base::MockTimer> timer_to_pass(
new base::MockTimer(false, false));
mock_timer_ = timer_to_pass.get();
- attachment_service_->SetTimerForTest(timer_to_pass.Pass());
+ attachment_service_->SetTimerForTest(std::move(timer_to_pass));
}
AttachmentService* attachment_service() { return attachment_service_.get(); }
@@ -263,7 +263,7 @@ class AttachmentServiceImplTest : public testing::Test,
void DownloadDone(const AttachmentService::GetOrDownloadResult& result,
scoped_ptr<AttachmentMap> attachments) {
download_results_.push_back(result);
- last_download_attachments_ = attachments.Pass();
+ last_download_attachments_ = std::move(attachments);
}
void RunLoop() {

Powered by Google App Engine
This is Rietveld 408576698