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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
455 lazy_params_->cache_max_size, | 455 lazy_params_->cache_max_size, |
456 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE) | 456 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE) |
457 .get()); | 457 .get()); |
458 net::HttpNetworkSession::Params network_session_params; | 458 net::HttpNetworkSession::Params network_session_params; |
459 PopulateNetworkSessionParams(profile_params, &network_session_params); | 459 PopulateNetworkSessionParams(profile_params, &network_session_params); |
460 net::HttpCache* main_cache = new net::HttpCache( | 460 net::HttpCache* main_cache = new net::HttpCache( |
461 network_session_params, main_backend); | 461 network_session_params, main_backend); |
462 main_cache->InitializeInfiniteCache(lazy_params_->infinite_cache_path); | 462 main_cache->InitializeInfiniteCache(lazy_params_->infinite_cache_path); |
463 | 463 |
464 #if defined(OS_ANDROID) || defined(OS_IOS) | 464 #if defined(OS_ANDROID) || defined(OS_IOS) |
465 #if defined(SPDY_PROXY_AUTH_VALUE) | |
mmenke
2014/05/09 15:27:08
Is this double #if really needed?
bengr
2014/05/09 15:47:28
Done.
piman
2014/05/12 19:19:24
Actually... it is.
clank/supplemental.gypi which m
mmenke
2014/05/12 19:21:58
I think it would make more sense to make it not de
| |
465 data_reduction_proxy::DataReductionProxySettings:: | 466 data_reduction_proxy::DataReductionProxySettings:: |
466 InitDataReductionProxySession(main_cache->GetSession()); | 467 InitDataReductionProxySession(main_cache->GetSession(), |
468 SPDY_PROXY_AUTH_VALUE); | |
469 #endif | |
467 #endif | 470 #endif |
468 | 471 |
469 if (chrome_browser_net::ShouldUseInMemoryCookiesAndCache()) { | 472 if (chrome_browser_net::ShouldUseInMemoryCookiesAndCache()) { |
470 main_cache->set_mode( | 473 main_cache->set_mode( |
471 chrome_browser_net::IsCookieRecordMode() ? | 474 chrome_browser_net::IsCookieRecordMode() ? |
472 net::HttpCache::RECORD : net::HttpCache::PLAYBACK); | 475 net::HttpCache::RECORD : net::HttpCache::PLAYBACK); |
473 } | 476 } |
474 | 477 |
475 main_http_factory_.reset(main_cache); | 478 main_http_factory_.reset(main_cache); |
476 main_context->set_http_transaction_factory(main_cache); | 479 main_context->set_http_transaction_factory(main_cache); |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
732 const base::Closure& completion) { | 735 const base::Closure& completion) { |
733 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 736 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
734 DCHECK(initialized()); | 737 DCHECK(initialized()); |
735 | 738 |
736 DCHECK(transport_security_state()); | 739 DCHECK(transport_security_state()); |
737 // Completes synchronously. | 740 // Completes synchronously. |
738 transport_security_state()->DeleteAllDynamicDataSince(time); | 741 transport_security_state()->DeleteAllDynamicDataSince(time); |
739 DCHECK(http_server_properties_manager_); | 742 DCHECK(http_server_properties_manager_); |
740 http_server_properties_manager_->Clear(completion); | 743 http_server_properties_manager_->Clear(completion); |
741 } | 744 } |
OLD | NEW |