AppCache and StoragePartition'ing

content/browser/storage_partition_impl_map.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/storage_partition_impl_map.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_constants.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace content {
 
 StoragePartitionImplMap::StoragePartitionImplMap(
     BrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
 StoragePartitionImplMap::~StoragePartitionImplMap() {
   STLDeleteContainerPairSecondPointers(partitions_.begin(),
@@ skipping 14 matching lines @@
     // TODO(ajwong): This should check the path is valid?
     CHECK(IsStringASCII(partition_id));
     partition_path = partition_path.Append(kStoragePartitionDirname)
         .AppendASCII(partition_id);
   }
 
   StoragePartitionImpl* storage_partition =
       StoragePartitionImpl::Create(browser_context_, partition_path);
   partitions_[partition_id] = storage_partition;
 
-  PostCreateInitialization(storage_partition, partition_path);
+  net::URLRequestContextGetter* request_context = partition_id.empty() ?
+      browser_context_->GetRequestContext() :
+      browser_context_->GetRequestContextForStoragePartition(partition_id);
+
+  PostCreateInitialization(storage_partition, partition_path, request_context);
 
   // TODO(ajwong): We need to remove this conditional by making
   // InitializeResourceContext() understand having different partition data
   // based on the renderer_id.
   if (partition_id.empty()) {
     InitializeResourceContext(browser_context_);
   }
 
   return storage_partition;
 }
 
 void StoragePartitionImplMap::ForEach(
     const BrowserContext::StoragePartitionCallback& callback) {
   for (std::map<std::string, StoragePartitionImpl*>::const_iterator it =
            partitions_.begin();
        it != partitions_.end();
        ++it) {
     callback.Run(it->first, it->second);
   }
 }
 
 void StoragePartitionImplMap::PostCreateInitialization(
     StoragePartitionImpl* partition,
-    const FilePath& partition_path) {
+    const FilePath& partition_path,
+    net::URLRequestContextGetter* request_context_getter) {
   // Check first to avoid memory leak in unittests.
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
                    partition->GetAppCacheService(),
                    browser_context_->IsOffTheRecord() ? FilePath() :
                        partition_path.Append(kAppCacheDirname),
-                       // TODO(michaeln): This is not right, appcache will be
-                       // using the cookies and cache of a the default
-                       // partition when populating the cache.
-                       // http://crbug.com/85121
-                       browser_context_->GetResourceContext(),
+                   browser_context_->GetResourceContext(),
+                   make_scoped_refptr(request_context_getter),
                    make_scoped_refptr(
                        browser_context_->GetSpecialStoragePolicy())));
   }
 }
 
 }  // namespace content