| Index: content/browser/storage_partition_impl.cc
|
| diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
|
| index 7ba19db086d3e608d288eec93a9530ff70a6b603..118eacd7cb6de852ff4cbf8500cb0f03562f1b28 100644
|
| --- a/content/browser/storage_partition_impl.cc
|
| +++ b/content/browser/storage_partition_impl.cc
|
| @@ -89,7 +89,8 @@ StoragePartitionImpl::~StoragePartitionImpl() {
|
| StoragePartitionImpl* StoragePartitionImpl::Create(
|
| BrowserContext* context,
|
| const std::string& partition_id,
|
| - const FilePath& profile_path) {
|
| + const FilePath& profile_path,
|
| + bool in_memory) {
|
| // 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) ||
|
| @@ -104,7 +105,7 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
|
| // that utilizes the QuotaManager.
|
| scoped_refptr<quota::QuotaManager> quota_manager =
|
| new quota::QuotaManager(
|
| - context->IsOffTheRecord(), partition_path,
|
| + in_memory, partition_path,
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
|
| context->GetSpecialStoragePolicy());
|
| @@ -112,17 +113,17 @@ StoragePartitionImpl* StoragePartitionImpl::Create(
|
| // Each consumer is responsible for registering its QuotaClient during
|
| // its construction.
|
| scoped_refptr<fileapi::FileSystemContext> filesystem_context =
|
| - CreateFileSystemContext(partition_path, context->IsOffTheRecord(),
|
| + CreateFileSystemContext(partition_path, in_memory,
|
| context->GetSpecialStoragePolicy(),
|
| quota_manager->proxy());
|
|
|
| scoped_refptr<webkit_database::DatabaseTracker> database_tracker =
|
| new webkit_database::DatabaseTracker(
|
| - partition_path, context->IsOffTheRecord(),
|
| + partition_path, in_memory,
|
| context->GetSpecialStoragePolicy(), quota_manager->proxy(),
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
|
|
|
| - FilePath path = context->IsOffTheRecord() ? FilePath() : partition_path;
|
| + FilePath path = in_memory ? FilePath() : partition_path;
|
| scoped_refptr<DOMStorageContextImpl> dom_storage_context =
|
| new DOMStorageContextImpl(path, context->GetSpecialStoragePolicy());
|
|
|
|
|