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_impl_io_data.h" | 5 #include "chrome/browser/profiles/profile_impl_io_data.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
508 BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( | 508 BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( |
509 base::SequencedWorkerPool::GetSequenceToken()), | 509 base::SequencedWorkerPool::GetSequenceToken()), |
510 lazy_params_->special_storage_policy.get()); | 510 lazy_params_->special_storage_policy.get()); |
511 channel_id_service = new net::ChannelIDService( | 511 channel_id_service = new net::ChannelIDService( |
512 new net::DefaultChannelIDStore(channel_id_db.get()), | 512 new net::DefaultChannelIDStore(channel_id_db.get()), |
513 base::WorkerPool::GetTaskRunner(true)); | 513 base::WorkerPool::GetTaskRunner(true)); |
514 } | 514 } |
515 | 515 |
516 set_channel_id_service(channel_id_service); | 516 set_channel_id_service(channel_id_service); |
517 main_context->set_channel_id_service(channel_id_service); | 517 main_context->set_channel_id_service(channel_id_service); |
| 518 main_cookie_store_->SetChannelIDServiceID(channel_id_service->GetUniqueID()); |
518 | 519 |
519 scoped_ptr<net::HttpCache::BackendFactory> main_backend( | 520 scoped_ptr<net::HttpCache::BackendFactory> main_backend( |
520 new net::HttpCache::DefaultBackend( | 521 new net::HttpCache::DefaultBackend( |
521 net::DISK_CACHE, | 522 net::DISK_CACHE, |
522 ChooseCacheBackendType(), | 523 ChooseCacheBackendType(), |
523 lazy_params_->cache_path, | 524 lazy_params_->cache_path, |
524 lazy_params_->cache_max_size, | 525 lazy_params_->cache_max_size, |
525 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE))); | 526 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE))); |
526 http_network_session_ = CreateHttpNetworkSession(*profile_params); | 527 http_network_session_ = CreateHttpNetworkSession(*profile_params); |
527 main_http_factory_ = CreateMainHttpFactory(http_network_session_.get(), | 528 main_http_factory_ = CreateMainHttpFactory(http_network_session_.get(), |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
765 const base::Closure& completion) { | 766 const base::Closure& completion) { |
766 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 767 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
767 DCHECK(initialized()); | 768 DCHECK(initialized()); |
768 | 769 |
769 DCHECK(transport_security_state()); | 770 DCHECK(transport_security_state()); |
770 // Completes synchronously. | 771 // Completes synchronously. |
771 transport_security_state()->DeleteAllDynamicDataSince(time); | 772 transport_security_state()->DeleteAllDynamicDataSince(time); |
772 DCHECK(http_server_properties_manager_); | 773 DCHECK(http_server_properties_manager_); |
773 http_server_properties_manager_->Clear(completion); | 774 http_server_properties_manager_->Clear(completion); |
774 } | 775 } |
OLD | NEW |