Get rid of WebKitContext. Only two out of six HTML5 related objects were in it and it was just a gl…

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/in_process_webkit/webkit_context.h"
 #include "content/browser/host_zoom_map_impl.h"
+#include "content/browser/in_process_webkit/indexed_db_context_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/database/database_tracker.h"
 
 // Key names on ResourceContext.
 static const char* kAppCacheServicKeyName = "content_appcache_service_tracker";
 static const char* kBlobStorageContextKeyName = "content_blob_storage_context";
 static const char* kDatabaseTrackerKeyName = "content_database_tracker";
 static const char* kFileSystemContextKeyName = "content_file_system_context";
+static const char* kIndexedDBContextKeyName = "content_indexed_db_context";
 static const char* kHostZoomMapKeyName = "content_host_zoom_map";
-static const char* kWebKitContextKeyName = "content_webkit_context";
 
 using appcache::AppCacheService;
 using base::UserDataAdapter;
 using content::BrowserThread;
 using fileapi::FileSystemContext;
 using webkit_blob::BlobStorageController;
 using webkit_database::DatabaseTracker;
 
 namespace content {
 
@@ skipping 22 matching lines @@
   return GetChromeBlobStorageContextForResourceContext(resource_context)->
       controller();
 }
 
 DatabaseTracker* GetDatabaseTrackerForResourceContext(
     ResourceContext* resource_context) {
   return UserDataAdapter<DatabaseTracker>::Get(
       resource_context, kDatabaseTrackerKeyName);
 }
 
-WebKitContext* GetWebKitContextForResourceContext(
+IndexedDBContextImpl* GetIndexedDBContextForResourceContext(
     ResourceContext* resource_context) {
-  return UserDataAdapter<WebKitContext>::Get(
-      resource_context, kWebKitContextKeyName);
+  return UserDataAdapter<IndexedDBContextImpl>::Get(
+      resource_context, kIndexedDBContextKeyName);
 }
 
 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
     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) {
   ResourceContext* resource_context = browser_context->GetResourceContext();
-
-  if (resource_context->GetUserData(kWebKitContextKeyName))
+  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;
+  }
 
   resource_context->SetUserData(
-      kWebKitContextKeyName,
-      new UserDataAdapter<WebKitContext>(
-          BrowserContext::GetWebKitContext(browser_context)));
+      kIndexedDBContextKeyName,
+      new UserDataAdapter<IndexedDBContextImpl>(
+          static_cast<IndexedDBContextImpl*>(
+              BrowserContext::GetIndexedDBContext(browser_context))));
   resource_context->SetUserData(
       kDatabaseTrackerKeyName,
       new UserDataAdapter<webkit_database::DatabaseTracker>(
           BrowserContext::GetDatabaseTracker(browser_context)));
   resource_context->SetUserData(
       kAppCacheServicKeyName,
       new UserDataAdapter<ChromeAppCacheService>(
           static_cast<ChromeAppCacheService*>(
               BrowserContext::GetAppCacheService(browser_context))));
   resource_context->SetUserData(
       kFileSystemContextKeyName,
       new UserDataAdapter<FileSystemContext>(
           BrowserContext::GetFileSystemContext(browser_context)));
   resource_context->SetUserData(
       kBlobStorageContextKeyName,
       new UserDataAdapter<ChromeBlobStorageContext>(
           ChromeBlobStorageContext::GetFor(browser_context)));
 
   // 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