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

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 1175733002: [Cronet] Set up HttpServerPropertiesManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: shutdown Created 5 years, 5 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
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 #include "net/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
15 #include "base/threading/thread.h" 15 #include "base/threading/thread.h"
16 #include "net/base/cache_type.h" 16 #include "net/base/cache_type.h"
17 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
18 #include "net/base/network_delegate_impl.h" 18 #include "net/base/network_delegate_impl.h"
19 #include "net/base/sdch_manager.h" 19 #include "net/base/sdch_manager.h"
20 #include "net/cert/cert_verifier.h" 20 #include "net/cert/cert_verifier.h"
21 #include "net/cookies/cookie_monster.h" 21 #include "net/cookies/cookie_monster.h"
22 #include "net/dns/host_resolver.h" 22 #include "net/dns/host_resolver.h"
23 #include "net/ftp/ftp_network_layer.h" 23 #include "net/ftp/ftp_network_layer.h"
24 #include "net/http/http_auth_handler_factory.h" 24 #include "net/http/http_auth_handler_factory.h"
25 #include "net/http/http_cache.h" 25 #include "net/http/http_cache.h"
26 #include "net/http/http_network_layer.h" 26 #include "net/http/http_network_layer.h"
27 #include "net/http/http_network_session.h" 27 #include "net/http/http_network_session.h"
28 #include "net/http/http_server_properties_impl.h" 28 #include "net/http/http_server_properties_impl.h"
29 #include "net/http/http_server_properties_manager.h"
29 #include "net/http/transport_security_persister.h" 30 #include "net/http/transport_security_persister.h"
30 #include "net/http/transport_security_state.h" 31 #include "net/http/transport_security_state.h"
31 #include "net/ssl/channel_id_service.h" 32 #include "net/ssl/channel_id_service.h"
32 #include "net/ssl/default_channel_id_store.h" 33 #include "net/ssl/default_channel_id_store.h"
33 #include "net/ssl/ssl_config_service_defaults.h" 34 #include "net/ssl/ssl_config_service_defaults.h"
34 #include "net/url_request/data_protocol_handler.h" 35 #include "net/url_request/data_protocol_handler.h"
35 #include "net/url_request/static_http_user_agent_settings.h" 36 #include "net/url_request/static_http_user_agent_settings.h"
36 #include "net/url_request/url_request_context.h" 37 #include "net/url_request/url_request_context.h"
37 #include "net/url_request/url_request_context_storage.h" 38 #include "net/url_request/url_request_context_storage.h"
38 #include "net/url_request/url_request_intercepting_job_factory.h" 39 #include "net/url_request/url_request_intercepting_job_factory.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 file_task_runner_ = file_thread_->task_runner(); 144 file_task_runner_ = file_thread_->task_runner();
144 } 145 }
145 return file_task_runner_; 146 return file_task_runner_;
146 } 147 }
147 148
148 void set_transport_security_persister( 149 void set_transport_security_persister(
149 scoped_ptr<TransportSecurityPersister> transport_security_persister) { 150 scoped_ptr<TransportSecurityPersister> transport_security_persister) {
150 transport_security_persister = transport_security_persister.Pass(); 151 transport_security_persister = transport_security_persister.Pass();
151 } 152 }
152 153
154 // Sets a HttpServerPropertiesManager. Note that the manager must be
155 // initialized prior to this call.
156 void set_http_server_properties_manager(
157 scoped_ptr<HttpServerPropertiesManager> http_server_properties_manager) {
158 http_server_properties_manager_ = http_server_properties_manager.Pass();
159 set_http_server_properties(http_server_properties_manager_->GetWeakPtr());
160 }
161
153 protected: 162 protected:
154 ~BasicURLRequestContext() override { AssertNoURLRequests(); } 163 ~BasicURLRequestContext() override {
164 AssertNoURLRequests();
165 // Shut down the |http_server_properties_manager_| if there is one, since
166 // this is the only place in BasicURLRequestContext to do so.
167 // Note that the shutdown is performed on the network thread.
168 if (http_server_properties_manager_)
169 http_server_properties_manager_->ShutdownOnPrefThread();
170 }
155 171
156 private: 172 private:
157 // The thread should be torn down last. 173 // The thread should be torn down last.
158 scoped_ptr<base::Thread> file_thread_; 174 scoped_ptr<base::Thread> file_thread_;
159 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_; 175 scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
160 176
161 URLRequestContextStorage storage_; 177 URLRequestContextStorage storage_;
162 scoped_ptr<TransportSecurityPersister> transport_security_persister_; 178 scoped_ptr<TransportSecurityPersister> transport_security_persister_;
179 scoped_ptr<HttpServerPropertiesManager> http_server_properties_manager_;
163 180
164 DISALLOW_COPY_AND_ASSIGN(BasicURLRequestContext); 181 DISALLOW_COPY_AND_ASSIGN(BasicURLRequestContext);
165 }; 182 };
166 183
167 } // namespace 184 } // namespace
168 185
169 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams() 186 URLRequestContextBuilder::HttpCacheParams::HttpCacheParams()
170 : type(IN_MEMORY), 187 : type(IN_MEMORY),
171 max_size(0) {} 188 max_size(0) {}
172 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {} 189 URLRequestContextBuilder::HttpCacheParams::~HttpCacheParams() {}
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 DCHECK(cookie_store); 253 DCHECK(cookie_store);
237 cookie_store_ = cookie_store; 254 cookie_store_ = cookie_store;
238 channel_id_service_ = channel_id_service.Pass(); 255 channel_id_service_ = channel_id_service.Pass();
239 } 256 }
240 257
241 void URLRequestContextBuilder::SetFileTaskRunner( 258 void URLRequestContextBuilder::SetFileTaskRunner(
242 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { 259 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
243 file_task_runner_ = task_runner; 260 file_task_runner_ = task_runner;
244 } 261 }
245 262
263 void URLRequestContextBuilder::SetHttpServerPropertiesManager(
264 scoped_ptr<HttpServerPropertiesManager> http_server_properties_manager) {
265 http_server_properties_manager_ = http_server_properties_manager.Pass();
266 }
267
246 URLRequestContext* URLRequestContextBuilder::Build() { 268 URLRequestContext* URLRequestContextBuilder::Build() {
247 BasicURLRequestContext* context = 269 BasicURLRequestContext* context =
248 new BasicURLRequestContext(file_task_runner_); 270 new BasicURLRequestContext(file_task_runner_);
249 URLRequestContextStorage* storage = context->storage(); 271 URLRequestContextStorage* storage = context->storage();
250 272
251 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings( 273 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings(
252 accept_language_, user_agent_)); 274 accept_language_, user_agent_));
253 275
254 if (!network_delegate_) 276 if (!network_delegate_)
255 network_delegate_.reset(new BasicNetworkDelegate); 277 network_delegate_.reset(new BasicNetworkDelegate);
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 storage->set_transport_security_state(new TransportSecurityState()); 341 storage->set_transport_security_state(new TransportSecurityState());
320 if (!transport_security_persister_path_.empty()) { 342 if (!transport_security_persister_path_.empty()) {
321 context->set_transport_security_persister( 343 context->set_transport_security_persister(
322 make_scoped_ptr<TransportSecurityPersister>( 344 make_scoped_ptr<TransportSecurityPersister>(
323 new TransportSecurityPersister(context->transport_security_state(), 345 new TransportSecurityPersister(context->transport_security_state(),
324 transport_security_persister_path_, 346 transport_security_persister_path_,
325 context->GetFileTaskRunner(), 347 context->GetFileTaskRunner(),
326 false))); 348 false)));
327 } 349 }
328 350
329 storage->set_http_server_properties( 351 if (http_server_properties_manager_) {
330 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); 352 context->set_http_server_properties_manager(
353 http_server_properties_manager_.Pass());
mmenke 2015/07/07 19:18:29 Why can't you just do: storage->set_http_server_p
xunjieli 2015/07/07 19:37:35 I agree that the naming is very confusing here. (T
354 } else {
355 storage->set_http_server_properties(
356 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
357 }
358
331 storage->set_cert_verifier(CertVerifier::CreateDefault()); 359 storage->set_cert_verifier(CertVerifier::CreateDefault());
332 360
333 if (throttling_enabled_) 361 if (throttling_enabled_)
334 storage->set_throttler_manager(new URLRequestThrottlerManager()); 362 storage->set_throttler_manager(new URLRequestThrottlerManager());
335 363
336 HttpNetworkSession::Params network_session_params; 364 HttpNetworkSession::Params network_session_params;
337 network_session_params.host_resolver = context->host_resolver(); 365 network_session_params.host_resolver = context->host_resolver();
338 network_session_params.cert_verifier = context->cert_verifier(); 366 network_session_params.cert_verifier = context->cert_verifier();
339 network_session_params.transport_security_state = 367 network_session_params.transport_security_state =
340 context->transport_security_state(); 368 context->transport_security_state();
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 } 449 }
422 url_request_interceptors_.weak_clear(); 450 url_request_interceptors_.weak_clear();
423 } 451 }
424 storage->set_job_factory(top_job_factory.release()); 452 storage->set_job_factory(top_job_factory.release());
425 // TODO(willchan): Support sdch. 453 // TODO(willchan): Support sdch.
426 454
427 return context; 455 return context;
428 } 456 }
429 457
430 } // namespace net 458 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698