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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
441 main_request_context_ = new ChromeURLRequestContext; | 441 main_request_context_ = new ChromeURLRequestContext; |
442 extensions_request_context_ = new ChromeURLRequestContext; | 442 extensions_request_context_ = new ChromeURLRequestContext; |
443 | 443 |
444 chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend); | 444 chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend); |
445 | 445 |
446 network_delegate_.reset(new ChromeNetworkDelegate( | 446 network_delegate_.reset(new ChromeNetworkDelegate( |
447 io_thread_globals->extension_event_router_forwarder.get(), | 447 io_thread_globals->extension_event_router_forwarder.get(), |
448 profile_params_->extension_info_map, | 448 profile_params_->extension_info_map, |
449 url_blacklist_manager_.get(), | 449 url_blacklist_manager_.get(), |
450 profile_params_->profile, | 450 profile_params_->profile, |
| 451 profile_params_->cookie_settings, |
451 &enable_referrers_)); | 452 &enable_referrers_)); |
452 | 453 |
453 fraudulent_certificate_reporter_.reset( | 454 fraudulent_certificate_reporter_.reset( |
454 new chrome_browser_net::ChromeFraudulentCertificateReporter( | 455 new chrome_browser_net::ChromeFraudulentCertificateReporter( |
455 main_request_context_)); | 456 main_request_context_)); |
456 | 457 |
457 proxy_service_.reset( | 458 proxy_service_.reset( |
458 ProxyServiceFactory::CreateProxyService( | 459 ProxyServiceFactory::CreateProxyService( |
459 io_thread->net_log(), | 460 io_thread->net_log(), |
460 io_thread_globals->proxy_script_fetcher_context.get(), | 461 io_thread_globals->proxy_script_fetcher_context.get(), |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 &resource_context_)); | 559 &resource_context_)); |
559 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); | 560 bool posted = BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this); |
560 if (!posted) | 561 if (!posted) |
561 delete this; | 562 delete this; |
562 } | 563 } |
563 | 564 |
564 void ProfileIOData::set_origin_bound_cert_service( | 565 void ProfileIOData::set_origin_bound_cert_service( |
565 net::OriginBoundCertService* origin_bound_cert_service) const { | 566 net::OriginBoundCertService* origin_bound_cert_service) const { |
566 origin_bound_cert_service_.reset(origin_bound_cert_service); | 567 origin_bound_cert_service_.reset(origin_bound_cert_service); |
567 } | 568 } |
OLD | NEW |