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

Side by Side Diff: google_apis/drive/base_requests_server_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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "google_apis/drive/base_requests.h" 5 #include "google_apis/drive/base_requests.h"
6 6
7 #include <memory>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
12 #include "base/run_loop.h" 13 #include "base/run_loop.h"
13 #include "google_apis/drive/dummy_auth_service.h" 14 #include "google_apis/drive/dummy_auth_service.h"
14 #include "google_apis/drive/request_sender.h" 15 #include "google_apis/drive/request_sender.h"
15 #include "google_apis/drive/task_util.h" 16 #include "google_apis/drive/task_util.h"
16 #include "google_apis/drive/test_util.h" 17 #include "google_apis/drive/test_util.h"
17 #include "net/test/embedded_test_server/embedded_test_server.h" 18 #include "net/test/embedded_test_server/embedded_test_server.h"
18 #include "net/test/embedded_test_server/http_request.h" 19 #include "net/test/embedded_test_server/http_request.h"
19 #include "net/test/embedded_test_server/http_response.h" 20 #include "net/test/embedded_test_server/http_response.h"
20 #include "net/url_request/url_request_test_util.h" 21 #include "net/url_request/url_request_test_util.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 base::Unretained(&http_request_))); 53 base::Unretained(&http_request_)));
53 } 54 }
54 55
55 // Returns a temporary file path suitable for storing the cache file. 56 // Returns a temporary file path suitable for storing the cache file.
56 base::FilePath GetTestCachedFilePath(const base::FilePath& file_name) { 57 base::FilePath GetTestCachedFilePath(const base::FilePath& file_name) {
57 return temp_dir_.path().Append(file_name); 58 return temp_dir_.path().Append(file_name);
58 } 59 }
59 60
60 base::MessageLoopForIO message_loop_; // Test server needs IO thread. 61 base::MessageLoopForIO message_loop_; // Test server needs IO thread.
61 net::EmbeddedTestServer test_server_; 62 net::EmbeddedTestServer test_server_;
62 scoped_ptr<RequestSender> request_sender_; 63 std::unique_ptr<RequestSender> request_sender_;
63 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_; 64 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;
64 base::ScopedTempDir temp_dir_; 65 base::ScopedTempDir temp_dir_;
65 66
66 // The incoming HTTP request is saved so tests can verify the request 67 // The incoming HTTP request is saved so tests can verify the request
67 // parameters like HTTP method (ex. some requests should use DELETE 68 // parameters like HTTP method (ex. some requests should use DELETE
68 // instead of GET). 69 // instead of GET).
69 net::test_server::HttpRequest http_request_; 70 net::test_server::HttpRequest http_request_;
70 }; 71 };
71 72
72 TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) { 73 TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 run_loop.Run(); 123 run_loop.Run();
123 } 124 }
124 EXPECT_EQ(HTTP_NOT_FOUND, result_code); 125 EXPECT_EQ(HTTP_NOT_FOUND, result_code);
125 EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method); 126 EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
126 EXPECT_EQ("/files/gdata/no-such-file.txt", 127 EXPECT_EQ("/files/gdata/no-such-file.txt",
127 http_request_.relative_url); 128 http_request_.relative_url);
128 // Do not verify the not found message. 129 // Do not verify the not found message.
129 } 130 }
130 131
131 } // namespace google_apis 132 } // namespace google_apis
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698