Fix race condition where the items on ResourceContext's UserData map were rewritten to the same val…

content/browser/resource_context_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/resource_context_impl.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/chrome_blob_storage_context.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/host_zoom_map_impl.h"
@@ skipping 61 matching lines @@
     ResourceContext* resource_context) {
   return UserDataAdapter<ChromeBlobStorageContext>::Get(
       resource_context, kBlobStorageContextKeyName);
 }
 
 HostZoomMap* GetHostZoomMapForResourceContext(ResourceContext* context) {
   return static_cast<NonOwningZoomData*>(
       context->GetUserData(kHostZoomMapKeyName))->host_zoom_map();
 }
 
-void EnsureResourceContextInitialized(BrowserContext* browser_context) {
+void InitializeResourceContext(BrowserContext* browser_context) {
   ResourceContext* resource_context = browser_context->GetResourceContext();
-  if (resource_context->GetUserData(kIndexedDBContextKeyName)) {
-    DCHECK(resource_context->GetUserData(kAppCacheServicKeyName));
-    DCHECK(resource_context->GetUserData(kBlobStorageContextKeyName));
-    DCHECK(resource_context->GetUserData(kDatabaseTrackerKeyName));
-    DCHECK(resource_context->GetUserData(kFileSystemContextKeyName));
-    DCHECK(resource_context->GetUserData(kHostZoomMapKeyName));
-    return;
-  }
+  DCHECK(!resource_context->GetUserData(kIndexedDBContextKeyName));
 
   resource_context->SetUserData(
       kIndexedDBContextKeyName,
       new UserDataAdapter<IndexedDBContextImpl>(
           static_cast<IndexedDBContextImpl*>(
               BrowserContext::GetIndexedDBContext(browser_context))));
   resource_context->SetUserData(
       kDatabaseTrackerKeyName,
       new UserDataAdapter<webkit_database::DatabaseTracker>(
           BrowserContext::GetDatabaseTracker(browser_context)));
@@ skipping 13 matching lines @@
 
   // This object is owned by the BrowserContext and not ResourceContext, so
   // store a non-owning pointer here.
   resource_context->SetUserData(
       kHostZoomMapKeyName,
       new NonOwningZoomData(
           HostZoomMap::GetForBrowserContext(browser_context)));
 }
 
 }  // namespace content