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

content/browser/storage_partition_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 "content/browser/storage_partition_impl.h"
 
 #include "content/browser/fileapi/browser_file_system_helper.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace content {
 
 StoragePartitionImpl::StoragePartitionImpl(
     const FilePath& partition_path,
     quota::QuotaManager* quota_manager,
     ChromeAppCacheService* appcache_service,
     fileapi::FileSystemContext* filesystem_context,
@@ skipping 21 matching lines @@
 
   if (GetDOMStorageContext())
     GetDOMStorageContext()->Shutdown();
 }
 
 // TODO(ajwong): Break the direct dependency on |context|. We only
 // need 3 pieces of info from it.
 StoragePartitionImpl* StoragePartitionImpl::Create(
     BrowserContext* context,
     const FilePath& partition_path) {
+

[michaeln, 2012/09/15 01:48:33]

stray newline

[awong, 2012/09/15 02:05:02]

Done.

   // Ensure that these methods are called on the UI thread, except for
   // unittests where a UI thread might not have been created.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          !BrowserThread::IsMessageLoopValid(BrowserThread::UI));
 
   // All of the clients have to be created and registered with the
   // QuotaManager prior to the QuotaManger being used. We do them
   // all together here prior to handing out a reference to anything
   // that utilizes the QuotaManager.
   scoped_refptr<quota::QuotaManager> quota_manager =
@@ skipping 31 matching lines @@
 
   return new StoragePartitionImpl(partition_path,
                                   quota_manager,
                                   appcache_service,
                                   filesystem_context,
                                   database_tracker,
                                   dom_storage_context,
                                   indexed_db_context);
 }
 
+FilePath StoragePartitionImpl::GetPath() {
+  return partition_path_;
+}
+
+net::URLRequestContextGetter* StoragePartitionImpl::GetURLRequestContext() {
+  return url_request_context_;
+}
+
+net::URLRequestContextGetter*
+StoragePartitionImpl::GetMediaURLRequestContext() {
+  return media_url_request_context_;
+}
+
 quota::QuotaManager* StoragePartitionImpl::GetQuotaManager() {
   return quota_manager_;
 }
 
 ChromeAppCacheService* StoragePartitionImpl::GetAppCacheService() {
   return appcache_service_;
 }
 
 fileapi::FileSystemContext* StoragePartitionImpl::GetFileSystemContext() {
   return filesystem_context_;
 }
 
 webkit_database::DatabaseTracker* StoragePartitionImpl::GetDatabaseTracker() {
   return database_tracker_;
 }
 
 DOMStorageContextImpl* StoragePartitionImpl::GetDOMStorageContext() {
   return dom_storage_context_;
 }
 
 IndexedDBContextImpl* StoragePartitionImpl::GetIndexedDBContext() {
   return indexed_db_context_;
 }
 
+void StoragePartitionImpl::SetURLRequestContext(
+    net::URLRequestContextGetter* url_request_context) {
+  url_request_context_ = url_request_context;
+}
+
+void StoragePartitionImpl::SetMediaURLRequestContext(
+    net::URLRequestContextGetter* media_url_request_context) {
+  media_url_request_context_ = media_url_request_context;
+}
+
 }  // namespace content