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

Side by Side Diff: ios/net/protocol_handler_util_unittest.mm

Issue 1586833002: Convert Pass()→std::move() for iOS build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert accidental //base change Created 4 years, 11 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
« no previous file with comments | « ios/net/http_cache_helper.cc ('k') | ios/web/app/web_main_loop.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 #import "ios/net/protocol_handler_util.h"
6
7 #include <utility>
8
5 #include "base/mac/scoped_nsobject.h" 9 #include "base/mac/scoped_nsobject.h"
6 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 12 #include "base/run_loop.h"
9 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
10 #import "ios/net/protocol_handler_util.h"
11 #include "net/base/elements_upload_data_stream.h" 14 #include "net/base/elements_upload_data_stream.h"
12 #import "net/base/mac/url_conversions.h" 15 #import "net/base/mac/url_conversions.h"
13 #include "net/base/upload_bytes_element_reader.h" 16 #include "net/base/upload_bytes_element_reader.h"
14 #include "net/http/http_request_headers.h" 17 #include "net/http/http_request_headers.h"
15 #include "net/http/http_response_headers.h" 18 #include "net/http/http_response_headers.h"
16 #include "net/url_request/data_protocol_handler.h" 19 #include "net/url_request/data_protocol_handler.h"
17 #include "net/url_request/url_request.h" 20 #include "net/url_request/url_request.h"
18 #include "net/url_request/url_request_job.h" 21 #include "net/url_request/url_request_job.h"
19 #include "net/url_request/url_request_job_factory.h" 22 #include "net/url_request/url_request_job_factory.h"
20 #include "net/url_request/url_request_job_factory_impl.h" 23 #include "net/url_request/url_request_job_factory_impl.h"
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 TEST_F(ProtocolHandlerUtilTest, AddMissingHeaders) { 257 TEST_F(ProtocolHandlerUtilTest, AddMissingHeaders) {
255 GURL url(std::string("http://url")); 258 GURL url(std::string("http://url"));
256 base::scoped_nsobject<NSMutableURLRequest> in_request( 259 base::scoped_nsobject<NSMutableURLRequest> in_request(
257 [[NSMutableURLRequest alloc] initWithURL:NSURLWithGURL(url)]); 260 [[NSMutableURLRequest alloc] initWithURL:NSURLWithGURL(url)]);
258 scoped_ptr<URLRequest> out_request( 261 scoped_ptr<URLRequest> out_request(
259 request_context_->CreateRequest(url, DEFAULT_PRIORITY, nullptr)); 262 request_context_->CreateRequest(url, DEFAULT_PRIORITY, nullptr));
260 out_request->set_method("POST"); 263 out_request->set_method("POST");
261 scoped_ptr<UploadElementReader> reader( 264 scoped_ptr<UploadElementReader> reader(
262 new UploadBytesElementReader(nullptr, 0)); 265 new UploadBytesElementReader(nullptr, 0));
263 out_request->set_upload( 266 out_request->set_upload(
264 ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0)); 267 ElementsUploadDataStream::CreateWithReader(std::move(reader), 0));
265 CopyHttpHeaders(in_request, out_request.get()); 268 CopyHttpHeaders(in_request, out_request.get());
266 269
267 // Some headers are added by default if missing. 270 // Some headers are added by default if missing.
268 const HttpRequestHeaders& headers = out_request->extra_request_headers(); 271 const HttpRequestHeaders& headers = out_request->extra_request_headers();
269 std::string header; 272 std::string header;
270 EXPECT_TRUE(headers.GetHeader("Accept", &header)); 273 EXPECT_TRUE(headers.GetHeader("Accept", &header));
271 EXPECT_EQ("*/*", header); 274 EXPECT_EQ("*/*", header);
272 EXPECT_TRUE(headers.GetHeader("Content-Type", &header)); 275 EXPECT_TRUE(headers.GetHeader("Content-Type", &header));
273 EXPECT_EQ("application/x-www-form-urlencoded", header); 276 EXPECT_EQ("application/x-www-form-urlencoded", header);
274 } 277 }
275 278
276 } // namespace net 279 } // namespace net
OLDNEW
« no previous file with comments | « ios/net/http_cache_helper.cc ('k') | ios/web/app/web_main_loop.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698