Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index 490f72f5a95b7be238549e7aa578511c0fc89dbe..f88a2119d2f4df5334ad7e9dbec68cff86d2c6a5 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -1291,6 +1291,7 @@ void ProfileImpl::CreateQuotaManagerAndClients() { |
if (quota_manager_.get()) { |
DCHECK(file_system_context_.get()); |
DCHECK(db_tracker_.get()); |
+ DCHECK(webkit_context_.get()); |
return; |
} |
@@ -1314,6 +1315,10 @@ void ProfileImpl::CreateQuotaManagerAndClients() { |
GetPath(), IsOffTheRecord(), GetExtensionSpecialStoragePolicy(), |
quota_manager_->proxy(), |
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); |
+ webkit_context_ = new WebKitContext( |
+ IsOffTheRecord(), GetPath(), GetExtensionSpecialStoragePolicy(), |
+ clear_local_state_on_exit_, quota_manager_->proxy(), |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::WEBKIT)); |
appcache_service_ = new ChromeAppCacheService(quota_manager_->proxy()); |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
@@ -1328,11 +1333,7 @@ void ProfileImpl::CreateQuotaManagerAndClients() { |
} |
WebKitContext* ProfileImpl::GetWebKitContext() { |
- if (!webkit_context_.get()) { |
- webkit_context_ = new WebKitContext( |
- IsOffTheRecord(), GetPath(), GetExtensionSpecialStoragePolicy(), |
- clear_local_state_on_exit_); |
- } |
+ CreateQuotaManagerAndClients(); |
return webkit_context_.get(); |
} |