Initial refactor to get profiles to propagate storage partition details.

chrome/browser/profiles/profile_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 "chrome/browser/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 44 matching lines @@
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/chrome_version_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
+#include "chrome/browser/storage_partition_details.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/user_style_sheet_watcher.h"
 #include "chrome/browser/visitedlink/visitedlink_event_listener.h"
 #include "chrome/browser/visitedlink/visitedlink_master.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 679 matching lines @@
   pref_file_path = pref_file_path.Append(chrome::kPreferencesFilename);
   return pref_file_path;
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
   return io_data_.GetMainRequestContextGetter();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess(
     int renderer_child_id) {
+  content::RenderProcessHost* rph = content::RenderProcessHost::FromID(
+      renderer_child_id);
+  CHECK(rph);
+  content::StoragePartition* storage_partition = rph->GetStoragePartition();

[awong, 2012/10/18 22:36:15]

If we're already reading out of the StoragePartition, can this just become
return storage_partition->GetRequestContext()?

I think this is safe because the true entry-point where StoragePartition calls
back into profile is actually GetRequestContextForStoragePartition(), no?

If that is true, and we make this change, go back to the comments in profile.h
and note which of the GetRequestContextXXX APIs just dispatch back into
StoragePartition (I think it'll only be this one).

[nasko, 2012/10/19 17:29:14]

I'm going to keep the guest check temporarily, until I get the other piece of
this change, because browser tag doesn't create a proper storage partition yet.
Even in the case of GetRequestContextForStoragePartition, we don't call back
into StoragePartition, as we have the data passed in as parameters. Hence I
think it is safe and we don't really need any comments.

[awong, 2012/10/19 21:20:24]

It's more to undersatnd when a function is just delegating back to the
StoragePartition so someone (eg., me) doesn't have to retrace which of the
various GetRequestContext functions are dispatching into StoragePartition.

+
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(this)->extension_service();
   if (extension_service) {
     const extensions::Extension* extension =
         extension_service->GetIsolatedAppForRenderer(renderer_child_id);
     if (extension)
-      return GetRequestContextForStoragePartition(extension->id());
+      return GetRequestContextForStoragePartition(
+          storage_partition->GetPath(),
+          storage_partition->IsInMemoryOnly());
   }
 
-  content::RenderProcessHost* rph = content::RenderProcessHost::FromID(
-      renderer_child_id);
-  if (rph && rph->IsGuest()) {
+  if (rph->IsGuest()) {
     // For guest processes (used by the browser tag), we need to isolate the
     // storage.
-    // TODO(nasko): Until we have proper storage partitions, create a
-    // non-persistent context using the RPH's id.
-    std::string id("guest-");
-    id.append(base::IntToString(renderer_child_id));
-    return GetRequestContextForStoragePartition(id);
+    // TODO(nasko): Pass the proper value for in_memory when the browser tag
+    // is wired properly with storage partition.
+    return GetRequestContextForStoragePartition(
+        storage_partition->GetPath(), true);
   }
 
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetMediaRequestContext() {
   // Return the default media context.
   return io_data_.GetMediaRequestContextGetter();
 }
 
 net::URLRequestContextGetter*
 ProfileImpl::GetMediaRequestContextForRenderProcess(
     int renderer_child_id) {
+  content::RenderProcessHost* rph = content::RenderProcessHost::FromID(

[awong, 2012/10/18 22:36:15]

Same comment as for GetRequestContextForRenderProcess()

[nasko, 2012/10/19 17:29:14]

Done.

+      renderer_child_id);
+  CHECK(rph);
+  content::StoragePartition* storage_partition = rph->GetStoragePartition();
+
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(this)->extension_service();
   if (extension_service) {
     const extensions::Extension* extension =
         extension_service->GetIsolatedAppForRenderer(renderer_child_id);
-    if (extension)
-      return io_data_.GetIsolatedMediaRequestContextGetter(extension->id());
+    if (extension) {
+      StoragePartitionDetails details(storage_partition->GetPath(),
+                                      storage_partition->IsInMemoryOnly());

[awong, 2012/10/18 22:36:15]

Wouldn't it be cleaner to just keep this struct inside io_data and make the
various GetXXXGetter() functions take 2 params?

That way we keep StoragePartitionDetails scoped to only the various io_data
classes.

[nasko, 2012/10/19 17:29:14]

Done.

+      return io_data_.GetIsolatedMediaRequestContextGetter(details);
+    }
   }
 
-  content::RenderProcessHost* rph = content::RenderProcessHost::FromID(
-      renderer_child_id);
-  if (rph && rph->IsGuest()) {
+  if (rph->IsGuest()) {
     // For guest processes (used by the browser tag), we need to isolate the
     // storage.
-    // TODO(nasko): Until we have proper storage partitions, create a
-    // non-persistent context using the RPH's id.
-    std::string id("guest-");
-    id.append(base::IntToString(renderer_child_id));
-    return io_data_.GetIsolatedMediaRequestContextGetter(id);
+    // TODO(nasko): Pass the proper value for in_memory when the browser tag
+    // is wired properly with storage partition.
+    StoragePartitionDetails details(storage_partition->GetPath(), true);
+    return io_data_.GetIsolatedMediaRequestContextGetter(details);
   }
 
   return io_data_.GetMediaRequestContextGetter();
 }
 
 net::URLRequestContextGetter*
 ProfileImpl::GetMediaRequestContextForStoragePartition(
-    const std::string& partition_id) {
-  return io_data_.GetIsolatedMediaRequestContextGetter(partition_id);
+    const FilePath& partition_path,
+    const bool& in_memory) {
+  StoragePartitionDetails details(partition_path, in_memory);
+  return io_data_.GetIsolatedMediaRequestContextGetter(details);
 }
 
 content::ResourceContext* ProfileImpl::GetResourceContext() {
   return io_data_.GetResourceContext();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
   return io_data_.GetExtensionsRequestContextGetter();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForStoragePartition(
-    const std::string& partition_id) {
-  return io_data_.GetIsolatedAppRequestContextGetter(partition_id);
+    const FilePath& partition_path,
+    const bool& in_memory) {
+  StoragePartitionDetails details(partition_path, in_memory);
+  return io_data_.GetIsolatedAppRequestContextGetter(details);
 }
 
 net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
   return ssl_config_service_manager_->Get();
 }
 
 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
   if (!host_content_settings_map_.get()) {
     host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
   }
@@ skipping 318 matching lines @@
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
     ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
   return io_data_.GetChromeURLDataManagerBackendGetter();
 }