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

chrome/browser/profiles/profile_impl_io_data.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 "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #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"
 #include "net/url_request/file_protocol_handler.h"
 #include "net/url_request/ftp_protocol_handler.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "webkit/quota/special_storage_policy.h"
 
 using content::BrowserThread;
 
@@ skipping 43 matching lines @@
 }
 
 void ProfileImplIOData::Handle::Init(
       const FilePath& cookie_path,
       const FilePath& server_bound_cert_path,
       const FilePath& cache_path,
       int cache_max_size,
       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,
       IOThread* io_thread,
       bool restore_old_session_cookies,
       quota::SpecialStoragePolicy* special_storage_policy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!io_data_->lazy_params_.get());
   DCHECK(predictor);
 
   LazyParams* lazy_params = new LazyParams;
 
   lazy_params->cookie_path = cookie_path;
   lazy_params->server_bound_cert_path = server_bound_cert_path;
   lazy_params->cache_path = cache_path;
   lazy_params->cache_max_size = cache_max_size;
   lazy_params->media_cache_path = media_cache_path;
   lazy_params->media_cache_max_size = media_cache_max_size;
   lazy_params->extensions_cookie_path = extensions_cookie_path;
   lazy_params->infinite_cache_path = infinite_cache_path;
   lazy_params->restore_old_session_cookies = restore_old_session_cookies;
   lazy_params->special_storage_policy = special_storage_policy;
 
   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;
 
   io_data_->predictor_.reset(predictor);
 
   if (!main_request_context_getter_) {
     main_request_context_getter_ =
         ChromeURLRequestContextGetter::CreateOriginal(
             profile_, io_data_);
   }
@@ skipping 369 matching lines @@
     ChromeURLRequestContext* main_context,
     const std::string& app_id) const {
   // If this is for a guest process, we should not persist cookies and http
   // cache.
   bool is_guest_process = (app_id.find("guest-") != std::string::npos);
 
   // Copy most state from the main context.
   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);

[willchan no longer on Chromium, 2012/09/14 23:52:45]

One thing that was sort of nice about the previous app_path thing is it was very
clearly a subdirectory. Here, this could return anything. Is it possible to get
this to append a relative path, rather than return an absolute path?

[awong, 2012/09/14 23:56:26]

Not sure how I'd do that without shifting some of the path creation logic out of
GetPartitionPath().  How is this not a subdirectory path?  I can't see why this
is any different from before...

Note that long term (probably second week of october), I'm going to start
working on removing this set of stuff from ProfileImplIOData.

[willchan no longer on Chromium, 2012/09/15 00:02:55]

Perhaps I'm confused? In the previous code, we have X = Y + Z;
In the new code, we have X = f(Y,Z);

In the former, X is clearly a subdirectory of Y. In the latter, that's not true.
Can you clarify what that means?

[willchan no longer on Chromium, 2012/09/15 00:03:44]

Fyi, I didn't read content::StoragePartition::GetPartitionPath(). So I have no
idea what it does. I looks like some function f() which could return anything.

[awong, 2012/09/15 00:08:00]

Ah, I see what you mean.  I want StoragePartition to own all the logic of how to
figure out where on disk this stuff sits.  Letting ProfileIODataImpl make
statements like the first one, that X is a subdirectory of Y, is an abstraction
break.  Hiding that detail is actually good here IMO.
As part of StorageIsolation, I want all code to retrieve the
URLRequestContextGetter() via the StoragePartition object.  I also want
StoragePartition to control the lifetime of the various
URLRequestContextGetters.  There's a lot of tangled lifetimes going on here , so
I don't have a completely clear roadmap, but at the end of this all the
following APIs should disappear:
  BrowserContext:GetRequestContext()
  BrowserContext:GetMediaRequestContext()
  BrowserContext:RequestContextForRenderProcess()

Consequently all the supporting logic in ProfileImplIOData (this included)
should go away.

[willchan no longer on Chromium, 2012/09/15 00:13:26]

Can you clarify this? Don't all storage partitions belong to some profile? If
that's the case, shouldn't all storage partitions (X) be in a subdirectory under
the profile path (Y)?

I guess I'm surprised it's not something like X = Y + f(Y,Z).

[awong, 2012/09/15 00:43:07]

Updated to be a relative path.

+
   FilePath cookie_path = app_path.Append(chrome::kCookieFilename);
   FilePath cache_path = app_path.Append(chrome::kCacheDirname);
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   // Only allow Record Mode if we are in a Debug build or where we are running
   // a cycle, and the user has limited control.
   bool record_mode = command_line.HasSwitch(switches::kRecordMode) &&
                      (chrome::kRecordModeEnabled ||
                       command_line.HasSwitch(switches::kVisitURLs));
   bool playback_mode = command_line.HasSwitch(switches::kPlaybackMode);
@@ skipping 52 matching lines @@
     const std::string& app_id) const {
   // If this is for a guest process, we do not persist storage, so we can
   // simply use the app's in-memory cache (like off-the-record mode).
   if (app_id.find("guest-") != std::string::npos)
     return original_context;
 
   // Copy most state from the original context.
   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()) {
     // lazy_params_ is only valid for the default media context creation.
     cache_path = lazy_params_->media_cache_path;
     cache_max_size = lazy_params_->media_cache_max_size;
   } else {
     cache_path = app_path.Append(chrome::kMediaCacheDirname);
   }
 
@@ skipping 62 matching lines @@
 void ProfileImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   LazyInitialize();
 
   DCHECK(transport_security_state());
   transport_security_state()->DeleteSince(time);
   DCHECK(http_server_properties_manager());
   http_server_properties_manager()->Clear();
 }