| Index: storage/browser/fileapi/sandbox_file_system_backend.cc
|
| diff --git a/webkit/browser/fileapi/sandbox_file_system_backend.cc b/storage/browser/fileapi/sandbox_file_system_backend.cc
|
| similarity index 68%
|
| rename from webkit/browser/fileapi/sandbox_file_system_backend.cc
|
| rename to storage/browser/fileapi/sandbox_file_system_backend.cc
|
| index cb288aaab910e40eefbe15c1ac4419663afa14a0..79620fe3e81911741c40475b9afcca38c16db89a 100644
|
| --- a/webkit/browser/fileapi/sandbox_file_system_backend.cc
|
| +++ b/storage/browser/fileapi/sandbox_file_system_backend.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
|
| +#include "storage/browser/fileapi/sandbox_file_system_backend.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/file_util.h"
|
| @@ -10,54 +10,50 @@
|
| #include "base/metrics/histogram.h"
|
| #include "base/task_runner_util.h"
|
| #include "url/gurl.h"
|
| -#include "webkit/browser/blob/file_stream_reader.h"
|
| -#include "webkit/browser/fileapi/async_file_util_adapter.h"
|
| -#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
|
| -#include "webkit/browser/fileapi/file_stream_writer.h"
|
| -#include "webkit/browser/fileapi/file_system_context.h"
|
| -#include "webkit/browser/fileapi/file_system_operation.h"
|
| -#include "webkit/browser/fileapi/file_system_operation_context.h"
|
| -#include "webkit/browser/fileapi/file_system_options.h"
|
| -#include "webkit/browser/fileapi/file_system_usage_cache.h"
|
| -#include "webkit/browser/fileapi/obfuscated_file_util.h"
|
| -#include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h"
|
| -#include "webkit/browser/fileapi/sandbox_quota_observer.h"
|
| -#include "webkit/browser/quota/quota_manager.h"
|
| -#include "webkit/common/fileapi/file_system_types.h"
|
| -#include "webkit/common/fileapi/file_system_util.h"
|
| +#include "storage/browser/blob/file_stream_reader.h"
|
| +#include "storage/browser/fileapi/async_file_util_adapter.h"
|
| +#include "storage/browser/fileapi/copy_or_move_file_validator.h"
|
| +#include "storage/browser/fileapi/file_stream_writer.h"
|
| +#include "storage/browser/fileapi/file_system_context.h"
|
| +#include "storage/browser/fileapi/file_system_operation.h"
|
| +#include "storage/browser/fileapi/file_system_operation_context.h"
|
| +#include "storage/browser/fileapi/file_system_options.h"
|
| +#include "storage/browser/fileapi/file_system_usage_cache.h"
|
| +#include "storage/browser/fileapi/obfuscated_file_util.h"
|
| +#include "storage/browser/fileapi/sandbox_file_system_backend_delegate.h"
|
| +#include "storage/browser/fileapi/sandbox_quota_observer.h"
|
| +#include "storage/browser/quota/quota_manager.h"
|
| +#include "storage/common/fileapi/file_system_types.h"
|
| +#include "storage/common/fileapi/file_system_util.h"
|
|
|
| using quota::QuotaManagerProxy;
|
| using quota::SpecialStoragePolicy;
|
|
|
| -namespace fileapi {
|
| +namespace storage {
|
|
|
| SandboxFileSystemBackend::SandboxFileSystemBackend(
|
| SandboxFileSystemBackendDelegate* delegate)
|
| - : delegate_(delegate),
|
| - enable_temporary_file_system_in_incognito_(false) {
|
| + : delegate_(delegate), enable_temporary_file_system_in_incognito_(false) {
|
| }
|
|
|
| SandboxFileSystemBackend::~SandboxFileSystemBackend() {
|
| }
|
|
|
| bool SandboxFileSystemBackend::CanHandleType(FileSystemType type) const {
|
| - return type == kFileSystemTypeTemporary ||
|
| - type == kFileSystemTypePersistent;
|
| + return type == kFileSystemTypeTemporary || type == kFileSystemTypePersistent;
|
| }
|
|
|
| void SandboxFileSystemBackend::Initialize(FileSystemContext* context) {
|
| DCHECK(delegate_);
|
|
|
| // Set quota observers.
|
| - delegate_->RegisterQuotaUpdateObserver(fileapi::kFileSystemTypeTemporary);
|
| + delegate_->RegisterQuotaUpdateObserver(storage::kFileSystemTypeTemporary);
|
| delegate_->AddFileAccessObserver(
|
| - fileapi::kFileSystemTypeTemporary,
|
| - delegate_->quota_observer(), NULL);
|
| + storage::kFileSystemTypeTemporary, delegate_->quota_observer(), NULL);
|
|
|
| - delegate_->RegisterQuotaUpdateObserver(fileapi::kFileSystemTypePersistent);
|
| + delegate_->RegisterQuotaUpdateObserver(storage::kFileSystemTypePersistent);
|
| delegate_->AddFileAccessObserver(
|
| - fileapi::kFileSystemTypePersistent,
|
| - delegate_->quota_observer(), NULL);
|
| + storage::kFileSystemTypePersistent, delegate_->quota_observer(), NULL);
|
| }
|
|
|
| void SandboxFileSystemBackend::ResolveURL(
|
| @@ -81,8 +77,7 @@ void SandboxFileSystemBackend::ResolveURL(
|
| GetFileSystemRootURI(url.origin(), url.type()));
|
| }
|
|
|
| -AsyncFileUtil* SandboxFileSystemBackend::GetAsyncFileUtil(
|
| - FileSystemType type) {
|
| +AsyncFileUtil* SandboxFileSystemBackend::GetAsyncFileUtil(FileSystemType type) {
|
| DCHECK(delegate_);
|
| return delegate_->file_util();
|
| }
|
| @@ -119,11 +114,11 @@ FileSystemOperation* SandboxFileSystemBackend::CreateFileSystemOperation(
|
| }
|
|
|
| bool SandboxFileSystemBackend::SupportsStreaming(
|
| - const fileapi::FileSystemURL& url) const {
|
| + const storage::FileSystemURL& url) const {
|
| return false;
|
| }
|
|
|
| -scoped_ptr<webkit_blob::FileStreamReader>
|
| +scoped_ptr<storage::FileStreamReader>
|
| SandboxFileSystemBackend::CreateFileStreamReader(
|
| const FileSystemURL& url,
|
| int64 offset,
|
| @@ -135,7 +130,7 @@ SandboxFileSystemBackend::CreateFileStreamReader(
|
| url, offset, expected_modification_time, context);
|
| }
|
|
|
| -scoped_ptr<fileapi::FileStreamWriter>
|
| +scoped_ptr<storage::FileStreamWriter>
|
| SandboxFileSystemBackend::CreateFileStreamWriter(
|
| const FileSystemURL& url,
|
| int64 offset,
|
| @@ -155,4 +150,4 @@ SandboxFileSystemBackend::CreateOriginEnumerator() {
|
| return delegate_->CreateOriginEnumerator();
|
| }
|
|
|
| -} // namespace fileapi
|
| +} // namespace storage
|
|
|