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 "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 params.client_socket_factory = client_socket_factory(); | 101 params.client_socket_factory = client_socket_factory(); |
102 params.host_resolver = host_resolver(); | 102 params.host_resolver = host_resolver(); |
103 params.cert_verifier = cert_verifier(); | 103 params.cert_verifier = cert_verifier(); |
104 params.transport_security_state = transport_security_state(); | 104 params.transport_security_state = transport_security_state(); |
105 params.proxy_service = proxy_service(); | 105 params.proxy_service = proxy_service(); |
106 params.ssl_config_service = ssl_config_service(); | 106 params.ssl_config_service = ssl_config_service(); |
107 params.http_auth_handler_factory = http_auth_handler_factory(); | 107 params.http_auth_handler_factory = http_auth_handler_factory(); |
108 params.network_delegate = network_delegate(); | 108 params.network_delegate = network_delegate(); |
109 params.http_server_properties = http_server_properties(); | 109 params.http_server_properties = http_server_properties(); |
110 params.net_log = net_log(); | 110 params.net_log = net_log(); |
| 111 params.channel_id_service = channel_id_service(); |
111 context_storage_.set_http_network_session( | 112 context_storage_.set_http_network_session( |
112 make_scoped_ptr(new HttpNetworkSession(params))); | 113 make_scoped_ptr(new HttpNetworkSession(params))); |
113 context_storage_.set_http_transaction_factory(make_scoped_ptr( | 114 context_storage_.set_http_transaction_factory(make_scoped_ptr( |
114 new HttpCache(context_storage_.http_network_session(), | 115 new HttpCache(context_storage_.http_network_session(), |
115 HttpCache::DefaultBackend::InMemory(0), false))); | 116 HttpCache::DefaultBackend::InMemory(0), false))); |
116 } | 117 } |
117 // In-memory cookie store. | 118 // In-memory cookie store. |
118 if (!cookie_store()) | 119 if (!cookie_store()) |
119 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); | 120 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); |
120 // In-memory Channel ID service. | 121 // In-memory Channel ID service. |
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 URLRequestJob* job = main_intercept_job_; | 638 URLRequestJob* job = main_intercept_job_; |
638 main_intercept_job_ = NULL; | 639 main_intercept_job_ = NULL; |
639 return job; | 640 return job; |
640 } | 641 } |
641 | 642 |
642 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { | 643 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { |
643 main_intercept_job_ = job; | 644 main_intercept_job_ = job; |
644 } | 645 } |
645 | 646 |
646 } // namespace net | 647 } // namespace net |
OLD | NEW |