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

content/browser/browser_context.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/public/browser/browser_context.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/in_process_webkit/dom_storage_context_impl.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
@@ skipping 74 matching lines @@
   context->SetUserData(
       kIndexedDBContextKeyName,
       new UserDataAdapter<IndexedDBContext>(indexed_db_context));
 
   scoped_refptr<ChromeAppCacheService> appcache_service =
       new ChromeAppCacheService(quota_manager->proxy());
   context->SetUserData(
       kAppCacheServicKeyName,
       new UserDataAdapter<ChromeAppCacheService>(appcache_service));
 
-  EnsureResourceContextInitialized(context);
+  InitializeResourceContext(context);
 
   // Check first to avoid memory leak in unittests.
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
                    appcache_service,
                    context->IsOffTheRecord() ? FilePath() :
                        context->GetPath().Append(content::kAppCacheDirname),
                    context->GetResourceContext(),
@@ skipping 56 matching lines @@
 }
 
 FileSystemContext* BrowserContext::GetFileSystemContext(
     BrowserContext* browser_context) {
   CreateQuotaManagerAndClients(browser_context);
   return UserDataAdapter<FileSystemContext>::Get(
       browser_context, kFileSystemContextKeyName);
 }
 
 void BrowserContext::EnsureResourceContextInitialized(BrowserContext* context) {
-  content::EnsureResourceContextInitialized(context);
+  // This will be enough to tickle initialization of BrowserContext if
+  // necessary, which initializes ResourceContext. The reason we don't call
+  // ResourceContext::InitializeResourceContext directly here is that if
+  // ResourceContext ends up initializing it will call back into BrowserContext
+  // and when that call return it'll end rewriting its UserData map (with the
+  // same value) but this causes a race condition. See http://crbug.com/115678.
+  CreateQuotaManagerAndClients(context);
 }
 
 void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
   GetDatabaseTracker(browser_context)->SaveSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&SaveSessionStateOnIOThread,
                    browser_context->GetResourceContext()));
@@ skipping 63 matching lines @@
       BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     DOMStorageContext* dom_storage_context =
         (static_cast<UserDataAdapter<DOMStorageContext>*>(
             GetUserData(kDOMStorageContextKeyName)))->release();
     BrowserThread::ReleaseSoon(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE, dom_storage_context);
   }
 }
 
 }  // namespace content