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 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 context_storage_.set_http_network_session( | 114 context_storage_.set_http_transaction_factory(new HttpCache( |
115 make_scoped_ptr(new HttpNetworkSession(params))); | 115 new HttpNetworkSession(params), |
116 context_storage_.set_http_transaction_factory( | 116 HttpCache::DefaultBackend::InMemory(0))); |
117 new HttpCache(context_storage_.http_network_session(), | |
118 HttpCache::DefaultBackend::InMemory(0), false)); | |
119 } | 117 } |
120 // In-memory cookie store. | 118 // In-memory cookie store. |
121 if (!cookie_store()) | 119 if (!cookie_store()) |
122 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); | 120 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); |
123 // In-memory Channel ID service. | 121 // In-memory Channel ID service. |
124 if (!channel_id_service()) { | 122 if (!channel_id_service()) { |
125 context_storage_.set_channel_id_service(make_scoped_ptr( | 123 context_storage_.set_channel_id_service(make_scoped_ptr( |
126 new ChannelIDService(new DefaultChannelIDStore(NULL), | 124 new ChannelIDService(new DefaultChannelIDStore(NULL), |
127 base::WorkerPool::GetTaskRunner(true)))); | 125 base::WorkerPool::GetTaskRunner(true)))); |
128 } | 126 } |
(...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 URLRequestJob* job = main_intercept_job_; | 629 URLRequestJob* job = main_intercept_job_; |
632 main_intercept_job_ = NULL; | 630 main_intercept_job_ = NULL; |
633 return job; | 631 return job; |
634 } | 632 } |
635 | 633 |
636 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { | 634 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { |
637 main_intercept_job_ = job; | 635 main_intercept_job_ = job; |
638 } | 636 } |
639 | 637 |
640 } // namespace net | 638 } // namespace net |
OLD | NEW |