Index: content/browser/storage_partition_impl.cc |
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc |
index 134c1617768d662b63465ce7f0ff6ecc6568b20c..480f023f9b9c961c42ca2376cf07df1e9a2d5c17 100644 |
--- a/content/browser/storage_partition_impl.cc |
+++ b/content/browser/storage_partition_impl.cc |
@@ -21,8 +21,8 @@ |
#include "net/cookies/cookie_monster.h" |
#include "net/url_request/url_request_context.h" |
#include "net/url_request/url_request_context_getter.h" |
-#include "webkit/browser/database/database_tracker.h" |
-#include "webkit/browser/quota/quota_manager.h" |
+#include "storage/browser/database/database_tracker.h" |
+#include "storage/browser/quota/quota_manager.h" |
namespace content { |
@@ -352,7 +352,7 @@ StoragePartitionImpl::StoragePartitionImpl( |
const base::FilePath& partition_path, |
quota::QuotaManager* quota_manager, |
ChromeAppCacheService* appcache_service, |
- fileapi::FileSystemContext* filesystem_context, |
+ storage::FileSystemContext* filesystem_context, |
webkit_database::DatabaseTracker* database_tracker, |
DOMStorageContextWrapper* dom_storage_context, |
IndexedDBContextImpl* indexed_db_context, |
@@ -368,7 +368,8 @@ StoragePartitionImpl::StoragePartitionImpl( |
indexed_db_context_(indexed_db_context), |
service_worker_context_(service_worker_context), |
webrtc_identity_store_(webrtc_identity_store), |
- special_storage_policy_(special_storage_policy) {} |
+ special_storage_policy_(special_storage_policy) { |
+} |
StoragePartitionImpl::~StoragePartitionImpl() { |
// These message loop checks are just to avoid leaks in unittests. |
@@ -414,10 +415,9 @@ StoragePartitionImpl* StoragePartitionImpl::Create( |
// Each consumer is responsible for registering its QuotaClient during |
// its construction. |
- scoped_refptr<fileapi::FileSystemContext> filesystem_context = |
- CreateFileSystemContext(context, |
- partition_path, in_memory, |
- quota_manager->proxy()); |
+ scoped_refptr<storage::FileSystemContext> filesystem_context = |
+ CreateFileSystemContext( |
+ context, partition_path, in_memory, quota_manager->proxy()); |
scoped_refptr<webkit_database::DatabaseTracker> database_tracker = |
new webkit_database::DatabaseTracker( |
@@ -492,7 +492,7 @@ ChromeAppCacheService* StoragePartitionImpl::GetAppCacheService() { |
return appcache_service_.get(); |
} |
-fileapi::FileSystemContext* StoragePartitionImpl::GetFileSystemContext() { |
+storage::FileSystemContext* StoragePartitionImpl::GetFileSystemContext() { |
return filesystem_context_.get(); |
} |