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

Side by Side Diff: net/url_request/url_request_test_util.h

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | « net/url_request/url_request_netlog_params.cc ('k') | net/url_request/url_request_test_util.cc » ('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 (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 #ifndef NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_ 5 #ifndef NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
6 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_ 6 #define NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10
11 #include <map> 10 #include <map>
12 #include <string> 11 #include <string>
12 #include <utility>
13 13
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/path_service.h" 17 #include "base/path_service.h"
18 #include "base/single_thread_task_runner.h" 18 #include "base/single_thread_task_runner.h"
19 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "base/time/time.h" 22 #include "base/time/time.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 ClientSocketFactory* client_socket_factory() { 65 ClientSocketFactory* client_socket_factory() {
66 return client_socket_factory_; 66 return client_socket_factory_;
67 } 67 }
68 void set_client_socket_factory(ClientSocketFactory* factory) { 68 void set_client_socket_factory(ClientSocketFactory* factory) {
69 client_socket_factory_ = factory; 69 client_socket_factory_ = factory;
70 } 70 }
71 71
72 void set_http_network_session_params( 72 void set_http_network_session_params(
73 scoped_ptr<HttpNetworkSession::Params> params) { 73 scoped_ptr<HttpNetworkSession::Params> params) {
74 http_network_session_params_ = params.Pass(); 74 http_network_session_params_ = std::move(params);
75 } 75 }
76 76
77 void SetSdchManager(scoped_ptr<SdchManager> sdch_manager) { 77 void SetSdchManager(scoped_ptr<SdchManager> sdch_manager) {
78 context_storage_.set_sdch_manager(sdch_manager.Pass()); 78 context_storage_.set_sdch_manager(std::move(sdch_manager));
79 } 79 }
80 80
81 private: 81 private:
82 bool initialized_; 82 bool initialized_;
83 83
84 // Optional parameters to override default values. Note that values that 84 // Optional parameters to override default values. Note that values that
85 // point to other objects the TestURLRequestContext creates will be 85 // point to other objects the TestURLRequestContext creates will be
86 // overwritten. 86 // overwritten.
87 scoped_ptr<HttpNetworkSession::Params> http_network_session_params_; 87 scoped_ptr<HttpNetworkSession::Params> http_network_session_params_;
88 88
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 NetworkDelegate* network_delegate) const override; 404 NetworkDelegate* network_delegate) const override;
405 void set_main_intercept_job(scoped_ptr<URLRequestJob> job); 405 void set_main_intercept_job(scoped_ptr<URLRequestJob> job);
406 406
407 private: 407 private:
408 mutable scoped_ptr<URLRequestJob> main_intercept_job_; 408 mutable scoped_ptr<URLRequestJob> main_intercept_job_;
409 }; 409 };
410 410
411 } // namespace net 411 } // namespace net
412 412
413 #endif // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_ 413 #endif // NET_URL_REQUEST_URL_REQUEST_TEST_UTIL_H_
OLDNEW
« no previous file with comments | « net/url_request/url_request_netlog_params.cc ('k') | net/url_request/url_request_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698