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

Unified Diff: google_apis/drive/files_list_request_runner_unittest.cc

Issue 1873663002: Convert //google_apis 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: google_apis/drive/files_list_request_runner_unittest.cc
diff --git a/google_apis/drive/files_list_request_runner_unittest.cc b/google_apis/drive/files_list_request_runner_unittest.cc
index e3e472dc8eab64687dd76560eb83d86e7a78f729..020ae6f7f54b397ef110e9755e9a2c7c489d6c93 100644
--- a/google_apis/drive/files_list_request_runner_unittest.cc
+++ b/google_apis/drive/files_list_request_runner_unittest.cc
@@ -4,9 +4,9 @@
#include "google_apis/drive/files_list_request_runner.h"
+#include <memory>
#include <utility>
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/sequenced_task_runner.h"
@@ -93,7 +93,7 @@ class FilesListRequestRunnerTest : public testing::Test {
// Called when the request is completed and no more backoff retries will
// happen.
- void OnCompleted(DriveApiErrorCode error, scoped_ptr<FileList> entry) {
+ void OnCompleted(DriveApiErrorCode error, std::unique_ptr<FileList> entry) {
response_error_.reset(new DriveApiErrorCode(error));
response_entry_ = std::move(entry);
on_completed_callback_.Run();
@@ -111,7 +111,7 @@ class FilesListRequestRunnerTest : public testing::Test {
}
// Handles a HTTP request to the Drive API server and returns a fake response.
- scoped_ptr<net::test_server::HttpResponse> OnFilesListRequest(
+ std::unique_ptr<net::test_server::HttpResponse> OnFilesListRequest(
const GURL& base_url,
const net::test_server::HttpRequest& request) {
http_request_.reset(new net::test_server::HttpRequest(request));
@@ -119,19 +119,19 @@ class FilesListRequestRunnerTest : public testing::Test {
}
base::MessageLoopForIO message_loop_; // Test server needs IO thread.
- scoped_ptr<RequestSender> request_sender_;
+ std::unique_ptr<RequestSender> request_sender_;
net::EmbeddedTestServer test_server_;
- scoped_ptr<FilesListRequestRunner> runner_;
+ std::unique_ptr<FilesListRequestRunner> runner_;
scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
base::Closure on_completed_callback_;
// Response set by test cases to be returned from the HTTP server.
- scoped_ptr<net::test_server::BasicHttpResponse> fake_server_response_;
+ std::unique_ptr<net::test_server::BasicHttpResponse> fake_server_response_;
// A requests and a response stored for verification in test cases.
- scoped_ptr<net::test_server::HttpRequest> http_request_;
- scoped_ptr<DriveApiErrorCode> response_error_;
- scoped_ptr<FileList> response_entry_;
+ std::unique_ptr<net::test_server::HttpRequest> http_request_;
+ std::unique_ptr<DriveApiErrorCode> response_error_;
+ std::unique_ptr<FileList> response_entry_;
};
TEST_F(FilesListRequestRunnerTest, Success_NoBackoff) {

Powered by Google App Engine
This is Rietveld 408576698