| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index 1cd7e74debeaa692cf9d6372200ea0bd48a86f7c..def2a9a93eaf860d31c81d32446ccff2f4624249 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -42,6 +42,7 @@
|
| #include "chrome/common/url_constants.h"
|
| #include "content/browser/appcache/chrome_appcache_service.h"
|
| #include "content/browser/chrome_blob_storage_context.h"
|
| +#include "content/browser/in_process_webkit/webkit_context.h"
|
| #include "content/browser/renderer_host/media/media_stream_manager.h"
|
| #include "content/browser/renderer_host/resource_dispatcher_host.h"
|
| #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
|
| @@ -234,6 +235,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
|
| params->appcache_service = profile->GetAppCacheService();
|
| params->blob_storage_context = profile->GetBlobStorageContext();
|
| params->file_system_context = profile->GetFileSystemContext();
|
| + params->webkit_context = profile->GetWebKitContext();
|
| params->quota_manager = profile->GetQuotaManager();
|
| params->extension_info_map = profile->GetExtensionInfoMap();
|
| params->notification_service =
|
| @@ -498,6 +500,7 @@ void ProfileIOData::LazyInitialize() const {
|
| appcache_service_ = profile_params_->appcache_service;
|
| blob_storage_context_ = profile_params_->blob_storage_context;
|
| file_system_context_ = profile_params_->file_system_context;
|
| + webkit_context_ = profile_params_->webkit_context;
|
| quota_manager_ = profile_params_->quota_manager;
|
| host_zoom_map_ = profile_params_->host_zoom_map;
|
| host_content_settings_map_ = profile_params_->host_content_settings_map;
|
| @@ -511,6 +514,7 @@ void ProfileIOData::LazyInitialize() const {
|
| resource_context_.set_appcache_service(appcache_service_);
|
| resource_context_.set_blob_storage_context(blob_storage_context_);
|
| resource_context_.set_file_system_context(file_system_context_);
|
| + resource_context_.set_webkit_context(webkit_context_);
|
| resource_context_.set_quota_manager(quota_manager_);
|
| resource_context_.set_host_zoom_map(host_zoom_map_);
|
| resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this));
|
|
|