AppCache and StoragePartition'ing

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 "base/logging.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
@@ skipping 13 matching lines @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/appcache/appcache_service.h"
 #include "webkit/appcache/view_appcache_internals_job.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_url_request_job_factory.h"
 #include "webkit/database/database_tracker.h"
 #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* kHostZoomMapKeyName = "content_host_zoom_map";
 
 using appcache::AppCacheService;
 using base::UserDataAdapter;
 using content::BrowserThread;
 using fileapi::FileSystemContext;
 using webkit_blob::BlobStorageController;
 using webkit_database::DatabaseTracker;
 
@@ skipping 133 matching lines @@
 
   job_factory->AddInterceptor(
       new DeveloperProtocolHandler(appcache_service,
                                    blob_storage_context->controller()));
 
   // TODO(jam): Add the ProtocolHandlerRegistryIntercepter here!
 }
 
 }  // namespace
 
-AppCacheService* ResourceContext::GetAppCacheService(ResourceContext* context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return UserDataAdapter<ChromeAppCacheService>::Get(
-      context, kAppCacheServiceKeyName);
-}
 
 ResourceContext::ResourceContext() {
   if (ResourceDispatcherHostImpl::Get())
     ResourceDispatcherHostImpl::Get()->AddResourceContext(this);
 }
 
 ResourceContext::~ResourceContext() {
   ResourceDispatcherHostImpl* rdhi = ResourceDispatcherHostImpl::Get();
   if (rdhi) {
     rdhi->CancelRequestsForContext(this);
     rdhi->RemoveResourceContext(this);
   }
 }
 
-BlobStorageController* GetBlobStorageControllerForResourceContext(
-    ResourceContext* resource_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return GetChromeBlobStorageContextForResourceContext(resource_context)->
-      controller();
-}
 ChromeBlobStorageContext* GetChromeBlobStorageContextForResourceContext(
     ResourceContext* resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return UserDataAdapter<ChromeBlobStorageContext>::Get(
       resource_context, kBlobStorageContextKeyName);
 }
 
 HostZoomMap* GetHostZoomMapForResourceContext(ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return static_cast<NonOwningZoomData*>(
       context->GetUserData(kHostZoomMapKeyName))->host_zoom_map();
 }
 
 void InitializeResourceContext(BrowserContext* browser_context) {
   ResourceContext* resource_context = browser_context->GetResourceContext();
   DCHECK(!resource_context->GetUserData(kHostZoomMapKeyName));
 
   resource_context->SetUserData(
-      kAppCacheServiceKeyName,
-      new UserDataAdapter<ChromeAppCacheService>(
-          static_cast<ChromeAppCacheService*>(
-              BrowserContext::GetAppCacheService(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)));
   resource_context->DetachUserDataThread();
 
+  StoragePartition* storage_partition =
+      BrowserContext::GetDefaultStoragePartition(browser_context);
+
   // Add content's URLRequestContext's hooks.
   // Check first to avoid memory leak in unittests.
   // TODO(creis): Do equivalent initializations for isolated app and isolated
   // media request contexts.
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     // TODO(ajwong): Move this whole block into
     // StoragePartitionImplMap::PostCreateInitialization after we're certain
     // this is safe to happen before InitializeResourceContext, and after we've
     // found the right URLRequestContext for a storage partition.  Otherwise,
     // our isolated URLRequestContext getters will do the wrong thing for blobs,
     // and FileSystemContext.
     //
     // http://crbug.com/85121
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         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(
         BrowserThread::IO, FROM_HERE,
         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))));
   }
 }
 
 }  // namespace content