Initial refactor to get profiles to propagate storage partition details.

chrome/browser/profiles/off_the_record_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/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 31 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/transport_security_state.h"
 #include "net/http/http_server_properties.h"
 #include "webkit/database/database_tracker.h"
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 208 matching lines @@
       GetDownloadManagerDelegate();
 }
 
 net::URLRequestContextGetter* OffTheRecordProfileImpl::GetRequestContext() {
   return io_data_.GetMainRequestContextGetter();
 }
 
 net::URLRequestContextGetter*
     OffTheRecordProfileImpl::GetRequestContextForRenderProcess(
         int renderer_child_id) {
-  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());
-  }
-
   content::RenderProcessHost* rph = content::RenderProcessHost::FromID(
       renderer_child_id);
-  if (rph && 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);
-  }
-
-  return GetRequestContext();
+  CHECK(rph);
+  content::StoragePartition* storage_partition = rph->GetStoragePartition();
+  return storage_partition->GetURLRequestContext();

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

return rpn->GetStoragePartition()->GetURLRequestContext()?

[nasko, 2012/10/19 22:09:00]

Done.

 }
 
 net::URLRequestContextGetter*
     OffTheRecordProfileImpl::GetMediaRequestContext() {
   // In OTR mode, media request context is the same as the original one.
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter*
     OffTheRecordProfileImpl::GetMediaRequestContextForRenderProcess(
         int renderer_child_id) {
   // In OTR mode, media request context is the same as the original one.
   return GetRequestContextForRenderProcess(renderer_child_id);
 }
 
 net::URLRequestContextGetter*
 OffTheRecordProfileImpl::GetMediaRequestContextForStoragePartition(
-    const std::string& partition_id) {
-  return GetRequestContextForStoragePartition(partition_id);
+    const FilePath& partition_path,
+    bool in_memory) {
+  return GetRequestContextForStoragePartition(partition_path, in_memory);
 }
 
 net::URLRequestContextGetter*
     OffTheRecordProfileImpl::GetRequestContextForExtensions() {
   return io_data_.GetExtensionsRequestContextGetter();
 }
 
 net::URLRequestContextGetter*
     OffTheRecordProfileImpl::GetRequestContextForStoragePartition(
-        const std::string& partition_id) {
-  return io_data_.GetIsolatedAppRequestContextGetter(partition_id);
+        const FilePath& partition_path,
+        bool in_memory) {
+  return io_data_.GetIsolatedAppRequestContextGetter(partition_path, in_memory);
 }
 
 content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() {
   return io_data_.GetResourceContext();
 }
 
 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() {
   return profile_->GetSSLConfigService();
 }
 
@@ skipping 164 matching lines @@
   if (!profile)
     profile = new OffTheRecordProfileImpl(this);
   profile->Init();
   return profile;
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
     OffTheRecordProfileImpl::GetChromeURLDataManagerBackendGetter() const {
   return io_data_.GetChromeURLDataManagerBackendGetter();
 }