Chromium Code Reviews| 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/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" | 
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 452 | 452 | 
| 453 ApplyProfileParamsToContext(main_context); | 453 ApplyProfileParamsToContext(main_context); | 
| 454 | 454 | 
| 455 if (http_server_properties_manager_) | 455 if (http_server_properties_manager_) | 
| 456 http_server_properties_manager_->InitializeOnNetworkThread(); | 456 http_server_properties_manager_->InitializeOnNetworkThread(); | 
| 457 | 457 | 
| 458 main_context->set_transport_security_state(transport_security_state()); | 458 main_context->set_transport_security_state(transport_security_state()); | 
| 459 | 459 | 
| 460 main_context->set_net_log(io_thread->net_log()); | 460 main_context->set_net_log(io_thread->net_log()); | 
| 461 | 461 | 
| 462 data_reduction_proxy_io_data()->Init(); | 462 data_reduction_proxy_io_data()->Init( | 
| 463 IOThread::ShouldEnableQuicForProxies() && | |
| 464 data_reduction_proxy::DataReductionProxyParams:: | |
| 465 IsIncludedInQuicFieldTrial()); | |
| 
 
mmenke
2015/02/13 17:45:22
The extra ShouldEnableQuicForProxies check seems w
 
tbansal1
2015/02/13 19:54:29
Done.
 
 | |
| 463 | 466 | 
| 464 network_delegate_ = data_reduction_proxy_io_data()->CreateNetworkDelegate( | 467 network_delegate_ = data_reduction_proxy_io_data()->CreateNetworkDelegate( | 
| 465 chrome_network_delegate.Pass(), true).Pass(); | 468 chrome_network_delegate.Pass(), true).Pass(); | 
| 466 | 469 | 
| 467 main_context->set_network_delegate(network_delegate_.get()); | 470 main_context->set_network_delegate(network_delegate_.get()); | 
| 468 | 471 | 
| 469 main_context->set_http_server_properties(http_server_properties()); | 472 main_context->set_http_server_properties(http_server_properties()); | 
| 470 | 473 | 
| 471 main_context->set_host_resolver( | 474 main_context->set_host_resolver( | 
| 472 io_thread_globals->host_resolver.get()); | 475 io_thread_globals->host_resolver.get()); | 
| (...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 849 const base::Closure& completion) { | 852 const base::Closure& completion) { | 
| 850 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 853 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 
| 851 DCHECK(initialized()); | 854 DCHECK(initialized()); | 
| 852 | 855 | 
| 853 DCHECK(transport_security_state()); | 856 DCHECK(transport_security_state()); | 
| 854 // Completes synchronously. | 857 // Completes synchronously. | 
| 855 transport_security_state()->DeleteAllDynamicDataSince(time); | 858 transport_security_state()->DeleteAllDynamicDataSince(time); | 
| 856 DCHECK(http_server_properties_manager_); | 859 DCHECK(http_server_properties_manager_); | 
| 857 http_server_properties_manager_->Clear(completion); | 860 http_server_properties_manager_->Clear(completion); | 
| 858 } | 861 } | 
| OLD | NEW |