Redo the Storage Partition directory layout to support guest tags and origin based partitions.

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"
@@ skipping 19 matching lines @@
 
 StoragePartitionImpl* StoragePartitionImplMap::Get(
     const std::string& partition_id) {
   // Find the previously created partition if it's available.
   std::map<std::string, StoragePartitionImpl*>::const_iterator it =
       partitions_.find(partition_id);
   if (it != partitions_.end())
     return it->second;
 
   // There was no previous partition, so let's make a new one.
-  FilePath partition_path = browser_context_->GetPath();
-  if (!partition_id.empty()) {
-    // 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);
+      StoragePartitionImpl::Create(browser_context_,
+                                   partition_id,
+                                   browser_context_->GetPath());
   partitions_[partition_id] = storage_partition;
 
-  PostCreateInitialization(storage_partition, partition_path);
+  PostCreateInitialization(storage_partition);
 
   // 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) {
+    StoragePartitionImpl* partition) {
   // 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),
+                       partition->GetPath().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(),
                    make_scoped_refptr(
                        browser_context_->GetSpecialStoragePolicy())));
   }
 }
 
 }  // namespace content