Fail gracefully if InitializeResourceContext ends up calling itself recursively.

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/webkit_context.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_constants.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 using appcache::AppCacheService;
 using base::UserDataAdapter;
 using content::BrowserThread;
 using fileapi::FileSystemContext;
 using quota::QuotaManager;
 using webkit_database::DatabaseTracker;
 
 // Key names on BrowserContext.

[erikwright (departed), 2012/02/23 22:16:00]

Note that these keys are sent to SupportsUserData::GetUserData where they are
compared (by pointer) to keys defined in resource_context_impl.cc. While some
linkers might cause these to have the same value, this is not what happens in my
development build. Therefore the below calls to GetUserData will all return NULL
even if the desired data is in fact stored.

[jam, 2012/02/23 23:11:36]

these aren't meant to be shared. the map on ResourceContext is different from
the map on BrowserContext.

 static const char* kAppCacheServicKeyName = "content_appcache_service_tracker";
 static const char* kDatabaseTrackerKeyName = "content_database_tracker";
 static const char* kFileSystemContextKeyName = "content_file_system_context";
 static const char* kQuotaManagerKeyName = "content_quota_manager";
 static const char* kWebKitContextKeyName = "content_webkit_context";
 
 namespace content {
 
 void CreateQuotaManagerAndClients(BrowserContext* context) {
   if (context->GetUserData(kQuotaManagerKeyName)) {
@@ skipping 84 matching lines @@
 }
 
 FileSystemContext* BrowserContext::GetFileSystemContext(
     BrowserContext* browser_context) {
   CreateQuotaManagerAndClients(browser_context);
   return UserDataAdapter<FileSystemContext>::Get(
       browser_context, kFileSystemContextKeyName);
 }
 
 void BrowserContext::EnsureResourceContextInitialized(BrowserContext* context) {
-  if (context->GetResourceContext()->GetUserData(kWebKitContextKeyName))
-    return;
   InitializeResourceContext(context);
 }
 
 BrowserContext::~BrowserContext() {
   if (GetUserData(kDatabaseTrackerKeyName) &&
       BrowserThread::IsMessageLoopValid(BrowserThread::FILE)) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&webkit_database::DatabaseTracker::Shutdown,
                    GetDatabaseTracker(this)));
   }
 }
 
 }  // namespace content