Chromium Code Reviews| Index: chrome/browser/profiles/profile_impl_io_data.cc |
| diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc |
| index c523c2509828fc0f2ab5958631270ad430f32b63..a711d709d634a5b83788c0863d6e1f6f1e22551a 100644 |
| --- a/chrome/browser/profiles/profile_impl_io_data.cc |
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc |
| @@ -29,6 +29,16 @@ |
| #include "net/http/http_cache.h" |
| #include "net/url_request/url_request_job_factory.h" |
| +namespace { |
| + |
| +void DeleteTransportSecurityStateSinceOnIOThread( |
| + ProfileImplIOData* io_data, const base::Time& time) { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| + io_data->transport_security_state()->DeleteSince(time); |
| +} |
| + |
| +} // namespace |
| + |
| ProfileImplIOData::Handle::Handle(Profile* profile) |
| : io_data_(new ProfileImplIOData), |
| profile_(profile), |
| @@ -171,6 +181,19 @@ ProfileImplIOData::Handle::GetIsolatedAppRequestContextGetter( |
| return context; |
| } |
| +void ProfileImplIOData::Handle::DeleteTransportSecurityStateSince( |
| + const base::Time& time) { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| + LazyInitialize(); |
| + |
| + BrowserThread::PostTask( |
| + BrowserThread::IO, FROM_HERE, |
| + NewRunnableFunction( |
|
willchan no longer on Chromium
2011/09/20 01:29:51
This is going to be deprecated soon (stay tuned fo
|
| + &DeleteTransportSecurityStateSinceOnIOThread, |
| + io_data_, |
| + time)); |
| +} |
| + |
| void ProfileImplIOData::Handle::LazyInitialize() const { |
| if (!initialized_) { |
| io_data_->InitializeOnUIThread(profile_); |
| @@ -220,6 +243,11 @@ void ProfileImplIOData::LazyInitializeInternal( |
| ApplyProfileParamsToContext(media_request_context_); |
| ApplyProfileParamsToContext(extensions_context); |
| + main_context->set_transport_security_state(transport_security_state()); |
| + media_request_context_->set_transport_security_state( |
| + transport_security_state()); |
| + extensions_context->set_transport_security_state(transport_security_state()); |
| + |
| main_context->set_net_log(io_thread->net_log()); |
| media_request_context_->set_net_log(io_thread->net_log()); |
| extensions_context->set_net_log(io_thread->net_log()); |