| Index: content/browser/resource_context_impl.cc
|
| diff --git a/content/browser/resource_context_impl.cc b/content/browser/resource_context_impl.cc
|
| index 525a10a02774b80c684b099d456c8ab38ed599d9..8a2adfb31f0ff81bad3f121c3bb258bfa2cdd2d6 100644
|
| --- a/content/browser/resource_context_impl.cc
|
| +++ b/content/browser/resource_context_impl.cc
|
| @@ -79,9 +79,12 @@ HostZoomMap* GetHostZoomMapForResourceContext(ResourceContext* context) {
|
| context->GetUserData(kHostZoomMapKeyName))->host_zoom_map();
|
| }
|
|
|
| -void InitializeResourceContext(BrowserContext* browser_context) {
|
| +void EnsureResourceContextInitialized(BrowserContext* browser_context) {
|
| ResourceContext* resource_context = browser_context->GetResourceContext();
|
| - DCHECK(!resource_context->GetUserData(kWebKitContextKeyName));
|
| +
|
| + if (resource_context->GetUserData(kWebKitContextKeyName))
|
| + return;
|
| +
|
| resource_context->SetUserData(
|
| kWebKitContextKeyName,
|
| new UserDataAdapter<WebKitContext>(
|
|
|