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

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

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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_uploader_impl_unittest.cc
diff --git a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
index eed1266b078c00ae3db6d35e469a1d08d8baf97b..ecb6ef9c169cef0031daffe532408f5f12222ee5 100644
--- a/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
+++ b/sync/internal_api/attachments/attachment_uploader_impl_unittest.cc
@@ -208,7 +208,7 @@ class AttachmentUploaderImplTest : public testing::Test,
// Returns the attachment that was uploaded.
Attachment UploadAndRespondWith(const net::HttpStatusCode& status_code);
- scoped_ptr<AttachmentUploader>& uploader();
+ std::unique_ptr<AttachmentUploader>& uploader();
const AttachmentUploader::UploadCallback& upload_callback() const;
std::vector<HttpRequest>& http_requests_received();
std::vector<AttachmentUploader::UploadResult>& upload_results();
@@ -224,8 +224,8 @@ class AttachmentUploaderImplTest : public testing::Test,
base::MessageLoopForIO message_loop_;
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
- scoped_ptr<RequestHandler> request_handler_;
- scoped_ptr<AttachmentUploader> uploader_;
+ std::unique_ptr<RequestHandler> request_handler_;
+ std::unique_ptr<AttachmentUploader> uploader_;
AttachmentUploader::UploadCallback upload_callback_;
net::EmbeddedTestServer server_;
// A closure that signals an upload has finished.
@@ -233,7 +233,7 @@ class AttachmentUploaderImplTest : public testing::Test,
std::vector<HttpRequest> http_requests_received_;
std::vector<AttachmentUploader::UploadResult> upload_results_;
std::vector<AttachmentId> attachment_ids_;
- scoped_ptr<MockOAuth2TokenService> token_service_;
+ std::unique_ptr<MockOAuth2TokenService> token_service_;
// Must be last data member.
base::WeakPtrFactory<AttachmentUploaderImplTest> weak_ptr_factory_;
@@ -252,7 +252,7 @@ class RequestHandler : public base::NonThreadSafe {
~RequestHandler();
- scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request);
+ std::unique_ptr<HttpResponse> HandleRequest(const HttpRequest& request);
// Set the HTTP status code to respond with.
void SetStatusCode(const net::HttpStatusCode& status_code);
@@ -330,7 +330,7 @@ Attachment AttachmentUploaderImplTest::UploadAndRespondWith(
return attachment;
}
-scoped_ptr<AttachmentUploader>& AttachmentUploaderImplTest::uploader() {
+std::unique_ptr<AttachmentUploader>& AttachmentUploaderImplTest::uploader() {
return uploader_;
}
@@ -388,14 +388,14 @@ RequestHandler::~RequestHandler() {
DetachFromThread();
}
-scoped_ptr<HttpResponse> RequestHandler::HandleRequest(
+std::unique_ptr<HttpResponse> RequestHandler::HandleRequest(
const HttpRequest& request) {
DCHECK(CalledOnValidThread());
test_task_runner_->PostTask(
FROM_HERE,
base::Bind(
&AttachmentUploaderImplTest::OnRequestReceived, test_, request));
- scoped_ptr<BasicHttpResponse> response(new BasicHttpResponse);
+ std::unique_ptr<BasicHttpResponse> response(new BasicHttpResponse);
response->set_code(GetStatusCode());
response->set_content_type("text/plain");
return std::move(response);

Powered by Google App Engine
This is Rietveld 408576698