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 "net/url_request/url_request_test_util.h" | 5 #include "net/url_request/url_request_test_util.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 params.client_socket_factory = client_socket_factory(); | 104 params.client_socket_factory = client_socket_factory(); |
105 params.host_resolver = host_resolver(); | 105 params.host_resolver = host_resolver(); |
106 params.cert_verifier = cert_verifier(); | 106 params.cert_verifier = cert_verifier(); |
107 params.transport_security_state = transport_security_state(); | 107 params.transport_security_state = transport_security_state(); |
108 params.proxy_service = proxy_service(); | 108 params.proxy_service = proxy_service(); |
109 params.ssl_config_service = ssl_config_service(); | 109 params.ssl_config_service = ssl_config_service(); |
110 params.http_auth_handler_factory = http_auth_handler_factory(); | 110 params.http_auth_handler_factory = http_auth_handler_factory(); |
111 params.network_delegate = network_delegate(); | 111 params.network_delegate = network_delegate(); |
112 params.http_server_properties = http_server_properties(); | 112 params.http_server_properties = http_server_properties(); |
113 params.net_log = net_log(); | 113 params.net_log = net_log(); |
| 114 params.channel_id_service = channel_id_service(); |
114 context_storage_.set_http_network_session( | 115 context_storage_.set_http_network_session( |
115 make_scoped_ptr(new HttpNetworkSession(params))); | 116 make_scoped_ptr(new HttpNetworkSession(params))); |
116 context_storage_.set_http_transaction_factory(make_scoped_ptr( | 117 context_storage_.set_http_transaction_factory(make_scoped_ptr( |
117 new HttpCache(context_storage_.http_network_session(), | 118 new HttpCache(context_storage_.http_network_session(), |
118 HttpCache::DefaultBackend::InMemory(0), false))); | 119 HttpCache::DefaultBackend::InMemory(0), false))); |
119 } | 120 } |
120 // In-memory cookie store. | 121 // In-memory cookie store. |
121 if (!cookie_store()) | 122 if (!cookie_store()) |
122 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); | 123 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); |
123 // In-memory Channel ID service. | 124 // In-memory Channel ID service. |
(...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 URLRequest* request, | 649 URLRequest* request, |
649 NetworkDelegate* network_delegate) const { | 650 NetworkDelegate* network_delegate) const { |
650 return main_intercept_job_.release(); | 651 return main_intercept_job_.release(); |
651 } | 652 } |
652 | 653 |
653 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) { | 654 void TestJobInterceptor::set_main_intercept_job(scoped_ptr<URLRequestJob> job) { |
654 main_intercept_job_ = std::move(job); | 655 main_intercept_job_ = std::move(job); |
655 } | 656 } |
656 | 657 |
657 } // namespace net | 658 } // namespace net |
OLD | NEW |