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

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: Pass ownership to storage and keep a raw ptr 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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 DCHECK(cookie_store); 237 DCHECK(cookie_store);
237 cookie_store_ = cookie_store; 238 cookie_store_ = cookie_store;
238 channel_id_service_ = channel_id_service.Pass(); 239 channel_id_service_ = channel_id_service.Pass();
239 } 240 }
240 241
241 void URLRequestContextBuilder::SetFileTaskRunner( 242 void URLRequestContextBuilder::SetFileTaskRunner(
242 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { 243 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
243 file_task_runner_ = task_runner; 244 file_task_runner_ = task_runner;
244 } 245 }
245 246
247 void URLRequestContextBuilder::SetHttpServerProperties(
248 scoped_ptr<HttpServerProperties> http_server_properties) {
249 http_server_properties_ = http_server_properties.Pass();
250 }
251
246 URLRequestContext* URLRequestContextBuilder::Build() { 252 URLRequestContext* URLRequestContextBuilder::Build() {
247 BasicURLRequestContext* context = 253 BasicURLRequestContext* context =
248 new BasicURLRequestContext(file_task_runner_); 254 new BasicURLRequestContext(file_task_runner_);
249 URLRequestContextStorage* storage = context->storage(); 255 URLRequestContextStorage* storage = context->storage();
250 256
251 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings( 257 storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings(
252 accept_language_, user_agent_)); 258 accept_language_, user_agent_));
253 259
254 if (!network_delegate_) 260 if (!network_delegate_)
255 network_delegate_.reset(new BasicNetworkDelegate); 261 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()); 325 storage->set_transport_security_state(new TransportSecurityState());
320 if (!transport_security_persister_path_.empty()) { 326 if (!transport_security_persister_path_.empty()) {
321 context->set_transport_security_persister( 327 context->set_transport_security_persister(
322 make_scoped_ptr<TransportSecurityPersister>( 328 make_scoped_ptr<TransportSecurityPersister>(
323 new TransportSecurityPersister(context->transport_security_state(), 329 new TransportSecurityPersister(context->transport_security_state(),
324 transport_security_persister_path_, 330 transport_security_persister_path_,
325 context->GetFileTaskRunner(), 331 context->GetFileTaskRunner(),
326 false))); 332 false)));
327 } 333 }
328 334
329 storage->set_http_server_properties( 335 if (http_server_properties_) {
330 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl())); 336 storage->set_http_server_properties(http_server_properties_.Pass());
337 } else {
338 storage->set_http_server_properties(
339 scoped_ptr<HttpServerProperties>(new HttpServerPropertiesImpl()));
340 }
341
331 storage->set_cert_verifier(CertVerifier::CreateDefault()); 342 storage->set_cert_verifier(CertVerifier::CreateDefault());
332 343
333 if (throttling_enabled_) 344 if (throttling_enabled_)
334 storage->set_throttler_manager(new URLRequestThrottlerManager()); 345 storage->set_throttler_manager(new URLRequestThrottlerManager());
335 346
336 HttpNetworkSession::Params network_session_params; 347 HttpNetworkSession::Params network_session_params;
337 network_session_params.host_resolver = context->host_resolver(); 348 network_session_params.host_resolver = context->host_resolver();
338 network_session_params.cert_verifier = context->cert_verifier(); 349 network_session_params.cert_verifier = context->cert_verifier();
339 network_session_params.transport_security_state = 350 network_session_params.transport_security_state =
340 context->transport_security_state(); 351 context->transport_security_state();
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 } 432 }
422 url_request_interceptors_.weak_clear(); 433 url_request_interceptors_.weak_clear();
423 } 434 }
424 storage->set_job_factory(top_job_factory.release()); 435 storage->set_job_factory(top_job_factory.release());
425 // TODO(willchan): Support sdch. 436 // TODO(willchan): Support sdch.
426 437
427 return context; 438 return context;
428 } 439 }
429 440
430 } // namespace net 441 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698