Make FileSystemContext respect StoragePartitions. filesystem:// urls will be properly isolated

content/browser/storage_partition_impl.h

Index: content/browser/storage_partition_impl.h
diff --git a/content/browser/storage_partition_impl.h b/content/browser/storage_partition_impl.h
index e7f2f5d35cdf629225d4ff66fc5932c93a239159..0b04bf5b4babeed25cbb085396c8f19ad1ffd8f9 100644
--- a/content/browser/storage_partition_impl.h
+++ b/content/browser/storage_partition_impl.h
@@ -23,10 +23,12 @@ class StoragePartitionImpl : public StoragePartition {
   // need 3 pieces of info from it.
   static StoragePartitionImpl* Create(BrowserContext* context,
                                       const std::string& partition_id,
-                                      const FilePath& partition_path);
+                                      const FilePath& profile_path);
 
   // StoragePartition interface.
   virtual FilePath GetPath() OVERRIDE;
+  virtual net::URLRequestContextGetter* GetURLRequestContext() OVERRIDE;
+  virtual net::URLRequestContextGetter* GetMediaURLRequestContext() OVERRIDE;
   virtual quota::QuotaManager* GetQuotaManager() OVERRIDE;
   virtual ChromeAppCacheService* GetAppCacheService() OVERRIDE;
   virtual fileapi::FileSystemContext* GetFileSystemContext() OVERRIDE;
@@ -35,15 +37,35 @@ class StoragePartitionImpl : public StoragePartition {
   virtual IndexedDBContextImpl* GetIndexedDBContext() OVERRIDE;
 
  private:
-  StoragePartitionImpl(const FilePath& partition_path,
-                       quota::QuotaManager* quota_manager,
-                       ChromeAppCacheService* appcache_service,
-                       fileapi::FileSystemContext* filesystem_context,
-                       webkit_database::DatabaseTracker* database_tracker,
-                       DOMStorageContextImpl* dom_storage_context,
-                       IndexedDBContextImpl* indexed_db_context);
+  friend class StoragePartitionImplMap;
+
+  StoragePartitionImpl(
+      const FilePath& partition_path,
+      quota::QuotaManager* quota_manager,
+      ChromeAppCacheService* appcache_service,
+      fileapi::FileSystemContext* filesystem_context,
+      webkit_database::DatabaseTracker* database_tracker,
+      DOMStorageContextImpl* dom_storage_context,
+      IndexedDBContextImpl* indexed_db_context);
+
+  // Used by StoragePartitionImplMap.
+  //
+  // TODO(ajwong): These should be taken in the constructor and in Create() but
+  // because the URLRequestContextGetter still lives in Profile with a tangle
+  // initialization, if we call try to retrieve the URLRequestContextGetter()

[Charlie Reis, 2012/09/17 22:51:12]

typo: call try

[awong, 2012/09/17 23:10:20]

Done.

+  // before the default StoragePartition is created, we end up reentering the
+  // construction and double-initializing.  For now, we retain the legacy
+  // behavior while allowing StoragePartitionImpl to expose these accessors by
+  // letting StoragePartitionImplMap call these two private settings at the
+  // appropriate time.  These should move back into the constructor once
+  // URLRequestContextGetter's lifetime is sorted out.
+  void SetURLRequestContext(net::URLRequestContextGetter* url_request_context);
+  void SetMediaURLRequestContext(
+      net::URLRequestContextGetter* media_url_request_context);
 
   FilePath partition_path_;
+  scoped_refptr<net::URLRequestContextGetter> url_request_context_;
+  scoped_refptr<net::URLRequestContextGetter> media_url_request_context_;
   scoped_refptr<quota::QuotaManager> quota_manager_;
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<fileapi::FileSystemContext> filesystem_context_;