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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 177 net_log, profile_, profile_->GetPrefs(), | 177 net_log, profile_, profile_->GetPrefs(), |
| 178 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), | 178 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
| 179 BrowserThread::GetMessageLoopProxyForThread( | 179 BrowserThread::GetMessageLoopProxyForThread( |
| 180 BrowserThread::UI)).Pass()); | 180 BrowserThread::UI)).Pass()); |
| 181 | 181 |
| 182 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile_)-> | 182 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile_)-> |
| 183 InitDataReductionProxySettings(io_data_->data_reduction_proxy_io_data(), | 183 InitDataReductionProxySettings(io_data_->data_reduction_proxy_io_data(), |
| 184 profile_->GetPrefs(), | 184 profile_->GetPrefs(), |
| 185 g_browser_process->local_state(), | 185 g_browser_process->local_state(), |
| 186 profile_->GetRequestContext()); | 186 profile_->GetRequestContext()); |
| 187 | |
| 188 const base::CommandLine& command_line = | |
| 189 *base::CommandLine::ForCurrentProcess(); | |
| 190 bool quic_enabled_for_proxies = | |
| 191 IOThread::ShouldEnableQuicForProxies(command_line, | |
| 192 IOThread::QuicTrialGroup()); | |
|
mmenke
2015/02/12 18:10:45
Calling IOThread methods on the UI threads, even s
tbansal1
2015/02/13 17:10:40
Fixed, now calling it on IO thread.
| |
| 193 | |
| 194 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile_)-> | |
| 195 EnableQuic(quic_enabled_for_proxies); | |
| 187 } | 196 } |
| 188 | 197 |
| 189 content::ResourceContext* | 198 content::ResourceContext* |
| 190 ProfileImplIOData::Handle::GetResourceContext() const { | 199 ProfileImplIOData::Handle::GetResourceContext() const { |
| 191 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 200 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 192 LazyInitialize(); | 201 LazyInitialize(); |
| 193 return GetResourceContextNoInit(); | 202 return GetResourceContextNoInit(); |
| 194 } | 203 } |
| 195 | 204 |
| 196 content::ResourceContext* | 205 content::ResourceContext* |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 847 const base::Closure& completion) { | 856 const base::Closure& completion) { |
| 848 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 857 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 849 DCHECK(initialized()); | 858 DCHECK(initialized()); |
| 850 | 859 |
| 851 DCHECK(transport_security_state()); | 860 DCHECK(transport_security_state()); |
| 852 // Completes synchronously. | 861 // Completes synchronously. |
| 853 transport_security_state()->DeleteAllDynamicDataSince(time); | 862 transport_security_state()->DeleteAllDynamicDataSince(time); |
| 854 DCHECK(http_server_properties_manager_); | 863 DCHECK(http_server_properties_manager_); |
| 855 http_server_properties_manager_->Clear(completion); | 864 http_server_properties_manager_->Clear(completion); |
| 856 } | 865 } |
| OLD | NEW |