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

chrome/browser/profiles/profile_impl_io_data.cc

Index: chrome/browser/profiles/profile_impl_io_data.cc
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index ed274946a3c4bf3c42edc26a8c904aa02783de54..2465441a1efd5b433fb039dfd103d4617d917ac9 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -32,6 +32,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/resource_context.h"
+#include "content/public/browser/storage_partition.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/ftp/ftp_network_layer.h"
 #include "net/http/http_cache.h"
@@ -95,7 +96,7 @@ void ProfileImplIOData::Handle::Init(
       const FilePath& media_cache_path,
       int media_cache_max_size,
       const FilePath& extensions_cookie_path,
-      const FilePath& app_path,
+      const FilePath& profile_path,
       const FilePath& infinite_cache_path,
       chrome_browser_net::Predictor* predictor,
       PrefService* local_state,
@@ -121,9 +122,9 @@ void ProfileImplIOData::Handle::Init(
 
   io_data_->lazy_params_.reset(lazy_params);
 
-  // Keep track of isolated app path and cache sizes separately so we can use
-  // them on demand.
-  io_data_->app_path_ = app_path;
+  // Keep track of profile path and cache sizes separately so we can use them
+  // on demand when creating storage isolated URLRequestContextGetters.
+  io_data_->profile_path_ = profile_path;
   io_data_->app_cache_max_size_ = cache_max_size;
   io_data_->app_media_cache_max_size_ = media_cache_max_size;
 
@@ -513,7 +514,9 @@ ProfileImplIOData::InitializeAppRequestContext(
   AppRequestContext* context = new AppRequestContext(load_time_stats());
   context->CopyFrom(main_context);
 
-  FilePath app_path = app_path_.AppendASCII(app_id);
+  FilePath app_path =
+      content::StoragePartition::GetPartitionPath(profile_path_, app_id);
+
   FilePath cookie_path = app_path.Append(chrome::kCookieFilename);
   FilePath cache_path = app_path.Append(chrome::kCacheDirname);
 
@@ -586,7 +589,8 @@ ProfileImplIOData::InitializeMediaRequestContext(
   MediaRequestContext* context = new MediaRequestContext(load_time_stats());
   context->CopyFrom(original_context);
 
-  FilePath app_path = app_path_.AppendASCII(app_id);
+  FilePath app_path =
+      content::StoragePartition::GetPartitionPath(profile_path_, app_id);
   FilePath cache_path;
   int cache_max_size = app_media_cache_max_size_;
   if (app_id.empty()) {