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

content/browser/worker_host/worker_storage_partition.h

Index: content/browser/worker_host/worker_storage_partition.h
diff --git a/content/browser/worker_host/worker_storage_partition.h b/content/browser/worker_host/worker_storage_partition.h
index accbb1bb4881ff49675149e4b4e0df9ddb65fbd5..5642e17325b513cae889d0b8e50aa41a1e319bf7 100644
--- a/content/browser/worker_host/worker_storage_partition.h
+++ b/content/browser/worker_host/worker_storage_partition.h
@@ -14,6 +14,10 @@ namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
 
+namespace net {
+class URLRequestContextGetter;
+}
+
 namespace webkit_database {
 class DatabaseTracker;
 }  // namespace webkit_database
@@ -32,10 +36,13 @@ class DatabaseTracker;
 // it which makes it look awkward as a struct.
 class WorkerStoragePartition {
  public:
-  WorkerStoragePartition(ChromeAppCacheService* appcache_service,
-                         fileapi::FileSystemContext* filesystem_context,
-                         webkit_database::DatabaseTracker* database_tracker,
-                         IndexedDBContextImpl* indexed_db_context);
+  WorkerStoragePartition(
+      net::URLRequestContextGetter* url_request_context,
+      net::URLRequestContextGetter* media_url_request_context,
+      ChromeAppCacheService* appcache_service,
+      fileapi::FileSystemContext* filesystem_context,
+      webkit_database::DatabaseTracker* database_tracker,
+      IndexedDBContextImpl* indexed_db_context);
   ~WorkerStoragePartition();
 
   // Declaring so these don't get inlined which has the unfortunate effect of
@@ -46,6 +53,14 @@ class WorkerStoragePartition {
 
   bool Equals(const WorkerStoragePartition& other) const;
 
+  net::URLRequestContextGetter* url_request_context() const {
+    return url_request_context_.get();
+  }
+
+  net::URLRequestContextGetter* media_url_request_context() const {
+    return media_url_request_context_.get();
+  }
+
   ChromeAppCacheService* appcache_service() const {
     return appcache_service_.get();
   }
@@ -65,6 +80,8 @@ class WorkerStoragePartition {
  private:
   void Copy(const WorkerStoragePartition& other);
 
+  scoped_refptr<net::URLRequestContextGetter> url_request_context_;
+  scoped_refptr<net::URLRequestContextGetter> media_url_request_context_;
   scoped_refptr<ChromeAppCacheService> appcache_service_;
   scoped_refptr<fileapi::FileSystemContext> filesystem_context_;
   scoped_refptr<webkit_database::DatabaseTracker> database_tracker_;