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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 new LoggingNetworkChangeObserver(net_log_)); | 378 new LoggingNetworkChangeObserver(net_log_)); |
379 | 379 |
380 globals_->extension_event_router_forwarder = | 380 globals_->extension_event_router_forwarder = |
381 extension_event_router_forwarder_; | 381 extension_event_router_forwarder_; |
382 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( | 382 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( |
383 extension_event_router_forwarder_, | 383 extension_event_router_forwarder_, |
384 NULL, | 384 NULL, |
385 NULL, | 385 NULL, |
386 NULL, | 386 NULL, |
387 NULL, | 387 NULL, |
388 &system_enable_referrers_)); | 388 ChromeNetworkDelegate::INCOGNITO_OFF, |
| 389 &system_enable_referrers_, |
| 390 NULL)); |
389 globals_->host_resolver.reset( | 391 globals_->host_resolver.reset( |
390 CreateGlobalHostResolver(net_log_)); | 392 CreateGlobalHostResolver(net_log_)); |
391 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 393 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
392 globals_->transport_security_state.reset(new net::TransportSecurityState("")); | 394 globals_->transport_security_state.reset(new net::TransportSecurityState("")); |
393 globals_->ssl_config_service = GetSSLConfigService(); | 395 globals_->ssl_config_service = GetSSLConfigService(); |
394 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 396 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
395 globals_->host_resolver.get())); | 397 globals_->host_resolver.get())); |
396 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); | 398 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); |
397 // For the ProxyScriptFetcher, we use a direct ProxyService. | 399 // For the ProxyScriptFetcher, we use a direct ProxyService. |
398 globals_->proxy_script_fetcher_proxy_service.reset( | 400 globals_->proxy_script_fetcher_proxy_service.reset( |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
599 new net::HttpNetworkLayer( | 601 new net::HttpNetworkLayer( |
600 new net::HttpNetworkSession(system_params))); | 602 new net::HttpNetworkSession(system_params))); |
601 globals_->system_ftp_transaction_factory.reset( | 603 globals_->system_ftp_transaction_factory.reset( |
602 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 604 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
603 globals_->system_request_context = | 605 globals_->system_request_context = |
604 ConstructSystemRequestContext(globals_, net_log_); | 606 ConstructSystemRequestContext(globals_, net_log_); |
605 | 607 |
606 sdch_manager_->set_sdch_fetcher( | 608 sdch_manager_->set_sdch_fetcher( |
607 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 609 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
608 } | 610 } |
OLD | NEW |