AppCache and StoragePartition'ing

content/browser/resource_context_impl.cc

Index: content/browser/resource_context_impl.cc
===================================================================
--- content/browser/resource_context_impl.cc	(revision 154786)
+++ content/browser/resource_context_impl.cc	(working copy)
@@ -31,11 +31,7 @@
 #include "webkit/fileapi/file_system_url_request_job_factory.h"
 
 // Key names on ResourceContext.
-static const char* kAppCacheServiceKeyName = "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";
 
 using appcache::AppCacheService;
@@ -188,11 +184,6 @@
 
 }  // namespace
 
-AppCacheService* ResourceContext::GetAppCacheService(ResourceContext* context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return UserDataAdapter<ChromeAppCacheService>::Get(
-      context, kAppCacheServiceKeyName);
-}
 
 ResourceContext::ResourceContext() {
   if (ResourceDispatcherHostImpl::Get())
@@ -207,34 +198,6 @@
   }
 }
 
-BlobStorageController* GetBlobStorageControllerForResourceContext(
-    ResourceContext* resource_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return GetChromeBlobStorageContextForResourceContext(resource_context)->
-      controller();
-}
-
-DatabaseTracker* GetDatabaseTrackerForResourceContext(
-    ResourceContext* resource_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return UserDataAdapter<DatabaseTracker>::Get(
-      resource_context, kDatabaseTrackerKeyName);
-}
-
-FileSystemContext* GetFileSystemContextForResourceContext(
-    ResourceContext* resource_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return UserDataAdapter<FileSystemContext>::Get(
-      resource_context, kFileSystemContextKeyName);
-}
-
-IndexedDBContextImpl* GetIndexedDBContextForResourceContext(
-    ResourceContext* resource_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return UserDataAdapter<IndexedDBContextImpl>::Get(
-      resource_context, kIndexedDBContextKeyName);
-}
-
 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
     ResourceContext* resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -250,28 +213,12 @@
 
 void InitializeResourceContext(BrowserContext* browser_context) {
   ResourceContext* resource_context = browser_context->GetResourceContext();
-  DCHECK(!resource_context->GetUserData(kIndexedDBContextKeyName));
+  DCHECK(!resource_context->GetUserData(kBlobStorageContextKeyName));
 
+  StoragePartition* storage_partition =
+      BrowserContext::GetDefaultStoragePartition(browser_context);
+
   resource_context->SetUserData(
-      kIndexedDBContextKeyName,
-      new UserDataAdapter<IndexedDBContextImpl>(
-          static_cast<IndexedDBContextImpl*>(
-              BrowserContext::GetIndexedDBContext(browser_context))));
-  resource_context->SetUserData(
-      kDatabaseTrackerKeyName,
-      new UserDataAdapter<webkit_database::DatabaseTracker>(
-          BrowserContext::GetDefaultStoragePartition(browser_context)->
-              GetDatabaseTracker()));
-  resource_context->SetUserData(
-      kAppCacheServiceKeyName,
-      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)));
@@ -302,9 +249,9 @@
         base::Bind(
             &InitializeRequestContext,
             make_scoped_refptr(browser_context->GetRequestContext()),
-            BrowserContext::GetAppCacheService(browser_context),
+            storage_partition->GetAppCacheService(),
             make_scoped_refptr(
-                BrowserContext::GetFileSystemContext(browser_context)),
+                storage_partition->GetFileSystemContext()),
             make_scoped_refptr(
                 ChromeBlobStorageContext::GetFor(browser_context))));
     BrowserThread::PostTask(
@@ -312,9 +259,9 @@
         base::Bind(
             &InitializeRequestContext,
             make_scoped_refptr(browser_context->GetMediaRequestContext()),
-            BrowserContext::GetAppCacheService(browser_context),
+            storage_partition->GetAppCacheService(),
             make_scoped_refptr(
-                BrowserContext::GetFileSystemContext(browser_context)),
+                storage_partition->GetFileSystemContext()),
             make_scoped_refptr(
                 ChromeBlobStorageContext::GetFor(browser_context))));
   }