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 f5fbdc8167d81f4fed78c775a68fc5e726eecbbb..3be66e8851b4723483ce15b8fe1cd81eb7f42ab9 100644 |
--- a/sync/internal_api/attachments/attachment_service_impl_unittest.cc |
+++ b/sync/internal_api/attachments/attachment_service_impl_unittest.cc |
@@ -231,7 +231,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(); |
@@ -240,14 +240,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(); } |
@@ -262,7 +262,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() { |