Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(269)

Unified Diff: content/browser/worker_host/worker_storage_partition.cc

Issue 10909182: Make FileSystemContext respect StoragePartitions. filesystem:// urls will be properly isolated (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch unittest fix from michael Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/worker_host/worker_storage_partition.cc
diff --git a/content/browser/worker_host/worker_storage_partition.cc b/content/browser/worker_host/worker_storage_partition.cc
index c253d72c9d06320b586dd0f1fa5082a667a9b6cb..2c4ca141d8a1e08110310b49035189b3a32847a5 100644
--- a/content/browser/worker_host/worker_storage_partition.cc
+++ b/content/browser/worker_host/worker_storage_partition.cc
@@ -8,15 +8,21 @@
#include "content/browser/appcache/chrome_appcache_service.h"
#include "content/browser/in_process_webkit/indexed_db_context_impl.h"
+#include "net/url_request/url_request_context_getter.h"
#include "webkit/database/database_tracker.h"
#include "webkit/fileapi/file_system_context.h"
+// TODO(ajwong): Handle MediaUrlRequestContext?
michaeln 2012/09/15 01:48:33 Is this TODO intentional, seems like its handled i
awong 2012/09/15 02:05:02 It was stale. removed.
WorkerStoragePartition::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)
- : appcache_service_(appcache_service),
+ : url_request_context_(url_request_context),
+ media_url_request_context_(media_url_request_context),
+ appcache_service_(appcache_service),
filesystem_context_(filesystem_context),
database_tracker_(database_tracker),
indexed_db_context_(indexed_db_context) {
@@ -35,7 +41,9 @@ const WorkerStoragePartition& WorkerStoragePartition::operator=(
bool WorkerStoragePartition::Equals(
const WorkerStoragePartition& other) const {
- return appcache_service_ == other.appcache_service_ &&
+ return url_request_context_ == other.url_request_context_ &&
+ media_url_request_context_ == other.media_url_request_context_ &&
+ appcache_service_ == other.appcache_service_ &&
filesystem_context_ == other.filesystem_context_ &&
database_tracker_ == other.database_tracker_ &&
indexed_db_context_ == other.indexed_db_context_;
@@ -45,6 +53,8 @@ WorkerStoragePartition::~WorkerStoragePartition() {
}
void WorkerStoragePartition::Copy(const WorkerStoragePartition& other) {
+ url_request_context_ = other.url_request_context_;
+ media_url_request_context_ = other.media_url_request_context_;
appcache_service_ = other.appcache_service_;
filesystem_context_ = other.filesystem_context_;
database_tracker_ = other.database_tracker_;

Powered by Google App Engine
This is Rietveld 408576698