OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/bind.h" | 10 #include "base/bind.h" |
10 #include "base/memory/scoped_ptr.h" | 11 #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 "base/values.h" | 14 #include "base/values.h" |
14 #include "google_apis/drive/drive_api_parser.h" | 15 #include "google_apis/drive/drive_api_parser.h" |
15 #include "google_apis/drive/drive_api_requests.h" | 16 #include "google_apis/drive/drive_api_requests.h" |
16 #include "google_apis/drive/dummy_auth_service.h" | 17 #include "google_apis/drive/dummy_auth_service.h" |
17 #include "google_apis/drive/request_sender.h" | 18 #include "google_apis/drive/request_sender.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 base::Bind(&BaseRequestsTest::HandleRequest, base::Unretained(this))); | 123 base::Bind(&BaseRequestsTest::HandleRequest, base::Unretained(this))); |
123 } | 124 } |
124 | 125 |
125 scoped_ptr<net::test_server::HttpResponse> HandleRequest( | 126 scoped_ptr<net::test_server::HttpResponse> HandleRequest( |
126 const net::test_server::HttpRequest& request) { | 127 const net::test_server::HttpRequest& request) { |
127 scoped_ptr<net::test_server::BasicHttpResponse> response( | 128 scoped_ptr<net::test_server::BasicHttpResponse> response( |
128 new net::test_server::BasicHttpResponse); | 129 new net::test_server::BasicHttpResponse); |
129 response->set_code(response_code_); | 130 response->set_code(response_code_); |
130 response->set_content(response_body_); | 131 response->set_content(response_body_); |
131 response->set_content_type("application/json"); | 132 response->set_content_type("application/json"); |
132 return response.Pass(); | 133 return std::move(response); |
133 } | 134 } |
134 | 135 |
135 base::MessageLoopForIO message_loop_; | 136 base::MessageLoopForIO message_loop_; |
136 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_; | 137 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_; |
137 scoped_ptr<RequestSender> sender_; | 138 scoped_ptr<RequestSender> sender_; |
138 net::EmbeddedTestServer test_server_; | 139 net::EmbeddedTestServer test_server_; |
139 | 140 |
140 net::HttpStatusCode response_code_; | 141 net::HttpStatusCode response_code_; |
141 std::string response_body_; | 142 std::string response_body_; |
142 }; | 143 }; |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 "\n" | 224 "\n" |
224 "This is a sample file. I like chocolate and chips.\n" | 225 "This is a sample file. I like chocolate and chips.\n" |
225 "\n" | 226 "\n" |
226 "--TESTBOUNDARY--", | 227 "--TESTBOUNDARY--", |
227 upload_content_data); | 228 upload_content_data); |
228 ASSERT_EQ(HTTP_SUCCESS, error); | 229 ASSERT_EQ(HTTP_SUCCESS, error); |
229 EXPECT_EQ("file_id", file->file_id()); | 230 EXPECT_EQ("file_id", file->file_id()); |
230 } | 231 } |
231 | 232 |
232 } // Namespace google_apis | 233 } // Namespace google_apis |
OLD | NEW |