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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
443 main_request_context_ = new ChromeURLRequestContext; | 443 main_request_context_ = new ChromeURLRequestContext; |
444 extensions_request_context_ = new ChromeURLRequestContext; | 444 extensions_request_context_ = new ChromeURLRequestContext; |
445 | 445 |
446 chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend); | 446 chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend); |
447 | 447 |
448 network_delegate_.reset(new ChromeNetworkDelegate( | 448 network_delegate_.reset(new ChromeNetworkDelegate( |
449 io_thread_globals->extension_event_router_forwarder.get(), | 449 io_thread_globals->extension_event_router_forwarder.get(), |
450 profile_params_->extension_info_map, | 450 profile_params_->extension_info_map, |
451 url_blacklist_manager_.get(), | 451 url_blacklist_manager_.get(), |
452 profile_params_->profile, | 452 profile_params_->profile, |
| 453 profile_params_->cookie_settings, |
453 &enable_referrers_)); | 454 &enable_referrers_)); |
454 | 455 |
455 fraudulent_certificate_reporter_.reset( | 456 fraudulent_certificate_reporter_.reset( |
456 new chrome_browser_net::ChromeFraudulentCertificateReporter( | 457 new chrome_browser_net::ChromeFraudulentCertificateReporter( |
457 main_request_context_)); | 458 main_request_context_)); |
458 | 459 |
459 proxy_service_.reset( | 460 proxy_service_.reset( |
460 ProxyServiceFactory::CreateProxyService( | 461 ProxyServiceFactory::CreateProxyService( |
461 io_thread->net_log(), | 462 io_thread->net_log(), |
462 io_thread_globals->proxy_script_fetcher_context.get(), | 463 io_thread_globals->proxy_script_fetcher_context.get(), |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
560 &resource_context_)); | 561 &resource_context_)); |
561 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 562 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
562 if (!posted) | 563 if (!posted) |
563 delete this; | 564 delete this; |
564 } | 565 } |
565 | 566 |
566 void ProfileIOData::set_origin_bound_cert_service( | 567 void ProfileIOData::set_origin_bound_cert_service( |
567 net::OriginBoundCertService* origin_bound_cert_service) const { | 568 net::OriginBoundCertService* origin_bound_cert_service) const { |
568 origin_bound_cert_service_.reset(origin_bound_cert_service); | 569 origin_bound_cert_service_.reset(origin_bound_cert_service); |
569 } | 570 } |
OLD | NEW |