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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
72 initialized_ = true; | 72 initialized_ = true; |
73 | 73 |
74 if (!host_resolver()) | 74 if (!host_resolver()) |
75 context_storage_.set_host_resolver( | 75 context_storage_.set_host_resolver( |
76 scoped_ptr<HostResolver>(new MockCachingHostResolver())); | 76 scoped_ptr<HostResolver>(new MockCachingHostResolver())); |
77 if (!proxy_service()) | 77 if (!proxy_service()) |
78 context_storage_.set_proxy_service(ProxyService::CreateDirect()); | 78 context_storage_.set_proxy_service(ProxyService::CreateDirect()); |
79 if (!cert_verifier()) | 79 if (!cert_verifier()) |
80 context_storage_.set_cert_verifier(CertVerifier::CreateDefault()); | 80 context_storage_.set_cert_verifier(CertVerifier::CreateDefault()); |
81 if (!transport_security_state()) | 81 if (!transport_security_state()) |
82 context_storage_.set_transport_security_state(new TransportSecurityState); | 82 context_storage_.set_transport_security_state( |
83 make_scoped_ptr(new TransportSecurityState)); | |
pauljensen
2015/08/28 13:38:03
some of these lines have "()" after constructor ca
Randy Smith (Not in Mondays)
2015/09/02 23:42:20
So I looked through the beginning of the full patc
| |
83 if (!ssl_config_service()) | 84 if (!ssl_config_service()) |
84 context_storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 85 context_storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
85 if (!http_auth_handler_factory()) { | 86 if (!http_auth_handler_factory()) { |
86 context_storage_.set_http_auth_handler_factory( | 87 context_storage_.set_http_auth_handler_factory( |
87 HttpAuthHandlerFactory::CreateDefault(host_resolver())); | 88 HttpAuthHandlerFactory::CreateDefault(host_resolver())); |
88 } | 89 } |
89 if (!http_server_properties()) { | 90 if (!http_server_properties()) { |
90 context_storage_.set_http_server_properties( | 91 context_storage_.set_http_server_properties( |
91 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); | 92 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); |
92 } | 93 } |
93 if (!transport_security_state()) { | |
94 context_storage_.set_transport_security_state( | |
95 new TransportSecurityState()); | |
96 } | |
97 if (http_transaction_factory()) { | 94 if (http_transaction_factory()) { |
98 // Make sure we haven't been passed an object we're not going to use. | 95 // Make sure we haven't been passed an object we're not going to use. |
99 EXPECT_FALSE(client_socket_factory_); | 96 EXPECT_FALSE(client_socket_factory_); |
100 } else { | 97 } else { |
101 HttpNetworkSession::Params params; | 98 HttpNetworkSession::Params params; |
102 if (http_network_session_params_) | 99 if (http_network_session_params_) |
103 params = *http_network_session_params_; | 100 params = *http_network_session_params_; |
104 params.client_socket_factory = client_socket_factory(); | 101 params.client_socket_factory = client_socket_factory(); |
105 params.host_resolver = host_resolver(); | 102 params.host_resolver = host_resolver(); |
106 params.cert_verifier = cert_verifier(); | 103 params.cert_verifier = cert_verifier(); |
107 params.transport_security_state = transport_security_state(); | 104 params.transport_security_state = transport_security_state(); |
108 params.proxy_service = proxy_service(); | 105 params.proxy_service = proxy_service(); |
109 params.ssl_config_service = ssl_config_service(); | 106 params.ssl_config_service = ssl_config_service(); |
110 params.http_auth_handler_factory = http_auth_handler_factory(); | 107 params.http_auth_handler_factory = http_auth_handler_factory(); |
111 params.network_delegate = network_delegate(); | 108 params.network_delegate = network_delegate(); |
112 params.http_server_properties = http_server_properties(); | 109 params.http_server_properties = http_server_properties(); |
113 params.net_log = net_log(); | 110 params.net_log = net_log(); |
114 context_storage_.set_http_transaction_factory(new HttpCache( | 111 context_storage_.set_http_transaction_factory( |
115 new HttpNetworkSession(params), | 112 scoped_ptr<HttpTransactionFactory>( |
116 HttpCache::DefaultBackend::InMemory(0))); | 113 new HttpCache(new HttpNetworkSession(params), |
114 HttpCache::DefaultBackend::InMemory(0)))); | |
117 } | 115 } |
118 // In-memory cookie store. | 116 // In-memory cookie store. |
119 if (!cookie_store()) | 117 if (!cookie_store()) |
120 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); | 118 context_storage_.set_cookie_store(new CookieMonster(NULL, NULL)); |
121 // In-memory Channel ID service. | 119 // In-memory Channel ID service. |
122 if (!channel_id_service()) { | 120 if (!channel_id_service()) { |
123 context_storage_.set_channel_id_service(make_scoped_ptr( | 121 context_storage_.set_channel_id_service(make_scoped_ptr( |
124 new ChannelIDService(new DefaultChannelIDStore(NULL), | 122 new ChannelIDService(new DefaultChannelIDStore(NULL), |
125 base::WorkerPool::GetTaskRunner(true)))); | 123 base::WorkerPool::GetTaskRunner(true)))); |
126 } | 124 } |
127 if (!http_user_agent_settings()) { | 125 if (!http_user_agent_settings()) { |
128 context_storage_.set_http_user_agent_settings( | 126 context_storage_.set_http_user_agent_settings( |
129 new StaticHttpUserAgentSettings("en-us,fr", std::string())); | 127 scoped_ptr<HttpUserAgentSettings>( |
128 new StaticHttpUserAgentSettings("en-us,fr", std::string()))); | |
130 } | 129 } |
131 if (!job_factory()) | 130 if (!job_factory()) { |
132 context_storage_.set_job_factory(new URLRequestJobFactoryImpl); | 131 context_storage_.set_job_factory( |
132 scoped_ptr<URLRequestJobFactory>(new URLRequestJobFactoryImpl)); | |
133 } | |
133 } | 134 } |
134 | 135 |
135 TestURLRequestContextGetter::TestURLRequestContextGetter( | 136 TestURLRequestContextGetter::TestURLRequestContextGetter( |
136 const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner) | 137 const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner) |
137 : network_task_runner_(network_task_runner) { | 138 : network_task_runner_(network_task_runner) { |
138 DCHECK(network_task_runner_.get()); | 139 DCHECK(network_task_runner_.get()); |
139 } | 140 } |
140 | 141 |
141 TestURLRequestContextGetter::TestURLRequestContextGetter( | 142 TestURLRequestContextGetter::TestURLRequestContextGetter( |
142 const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner, | 143 const scoped_refptr<base::SingleThreadTaskRunner>& network_task_runner, |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
627 URLRequestJob* job = main_intercept_job_; | 628 URLRequestJob* job = main_intercept_job_; |
628 main_intercept_job_ = NULL; | 629 main_intercept_job_ = NULL; |
629 return job; | 630 return job; |
630 } | 631 } |
631 | 632 |
632 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { | 633 void TestJobInterceptor::set_main_intercept_job(URLRequestJob* job) { |
633 main_intercept_job_ = job; | 634 main_intercept_job_ = job; |
634 } | 635 } |
635 | 636 |
636 } // namespace net | 637 } // namespace net |
OLD | NEW |