#include "base/basictypes.h"
#include "base/bind.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "content/public/test/test_file_system_backend.h"
#include "content/public/test/test_file_system_context.h"
#include "content/test/fileapi_test_file_set.h"
+#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/copy_or_move_file_validator.h"
+#include "storage/browser/fileapi/copy_or_move_operation_delegate.h"
+#include "storage/browser/fileapi/file_stream_writer.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_operation.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/common/fileapi/file_system_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/blob/file_stream_reader.h"
-#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
-#include "webkit/browser/fileapi/copy_or_move_operation_delegate.h"
-#include "webkit/browser/fileapi/file_stream_writer.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_operation.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/common/fileapi/file_system_util.h"
using content::AsyncFileTestHelper;
-using fileapi::CopyOrMoveOperationDelegate;
-using fileapi::FileStreamWriter;
-using fileapi::FileSystemOperation;
-using fileapi::FileSystemURL;
+using storage::CopyOrMoveOperationDelegate;
+using storage::FileStreamWriter;
+using storage::FileSystemOperation;
+using storage::FileSystemURL;
namespace content {
-typedef fileapi::FileSystemOperation::FileEntryList FileEntryList;
+typedef storage::FileSystemOperation::FileEntryList FileEntryList;
namespace {
ASSERT_EQ(base::File::FILE_OK, error);
}
-class TestValidatorFactory : public fileapi::CopyOrMoveFileValidatorFactory {
+class TestValidatorFactory : public storage::CopyOrMoveFileValidatorFactory {
public:
// A factory that creates validators that accept everything or nothing.
TestValidatorFactory() {}
virtual ~TestValidatorFactory() {}
- virtual fileapi::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
+ virtual storage::CopyOrMoveFileValidator* CreateCopyOrMoveFileValidator(
const FileSystemURL& /*src_url*/,
const base::FilePath& /*platform_path*/) OVERRIDE {
// Move arg management to TestValidator?
}
private:
- class TestValidator : public fileapi::CopyOrMoveFileValidator {
+ class TestValidator : public storage::CopyOrMoveFileValidator {
public:
explicit TestValidator(bool pre_copy_valid,
bool post_copy_valid,
// Records CopyProgressCallback invocations.
struct ProgressRecord {
- fileapi::FileSystemOperation::CopyProgressType type;
+ storage::FileSystemOperation::CopyProgressType type;
FileSystemURL source_url;
FileSystemURL dest_url;
int64 size;
};
void RecordProgressCallback(std::vector<ProgressRecord>* records,
- fileapi::FileSystemOperation::CopyProgressType type,
+ storage::FileSystemOperation::CopyProgressType type,
const FileSystemURL& source_url,
const FileSystemURL& dest_url,
int64 size) {
class CopyOrMoveOperationTestHelper {
public:
CopyOrMoveOperationTestHelper(const GURL& origin,
- fileapi::FileSystemType src_type,
- fileapi::FileSystemType dest_type)
+ storage::FileSystemType src_type,
+ storage::FileSystemType dest_type)
: origin_(origin), src_type_(src_type), dest_type_(dest_type) {}
~CopyOrMoveOperationTestHelper() {
CreateFileSystemContextForTesting(quota_manager_proxy_.get(), base_dir);
// Prepare the origin's root directory.
- fileapi::FileSystemBackend* backend =
+ storage::FileSystemBackend* backend =
file_system_context_->GetFileSystemBackend(src_type_);
backend->ResolveURL(
FileSystemURL::CreateForTest(origin_, src_type_, base::FilePath()),
- fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+ storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::Bind(&ExpectOk));
backend = file_system_context_->GetFileSystemBackend(dest_type_);
- if (dest_type_ == fileapi::kFileSystemTypeTest) {
+ if (dest_type_ == storage::kFileSystemTypeTest) {
TestFileSystemBackend* test_backend =
static_cast<TestFileSystemBackend*>(backend);
- scoped_ptr<fileapi::CopyOrMoveFileValidatorFactory> factory(
+ scoped_ptr<storage::CopyOrMoveFileValidatorFactory> factory(
new TestValidatorFactory);
test_backend->set_require_copy_or_move_validator(
require_copy_or_move_validator);
}
backend->ResolveURL(
FileSystemURL::CreateForTest(origin_, dest_type_, base::FilePath()),
- fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+ storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::Bind(&ExpectOk));
base::RunLoop().RunUntilIdle();
// Grant relatively big quota initially.
quota_manager_->SetQuota(
origin_,
- fileapi::FileSystemTypeToQuotaStorageType(src_type_),
+ storage::FileSystemTypeToQuotaStorageType(src_type_),
1024 * 1024);
quota_manager_->SetQuota(
origin_,
- fileapi::FileSystemTypeToQuotaStorageType(dest_type_),
+ storage::FileSystemTypeToQuotaStorageType(dest_type_),
1024 * 1024);
}
}
private:
- void GetUsageAndQuota(fileapi::FileSystemType type,
+ void GetUsageAndQuota(storage::FileSystemType type,
int64* usage,
int64* quota) {
- quota::QuotaStatusCode status = AsyncFileTestHelper::GetUsageAndQuota(
+ storage::QuotaStatusCode status = AsyncFileTestHelper::GetUsageAndQuota(
quota_manager_.get(), origin_, type, usage, quota);
- ASSERT_EQ(quota::kQuotaStatusOk, status);
+ ASSERT_EQ(storage::kQuotaStatusOk, status);
}
private:
base::ScopedTempDir base_;
const GURL origin_;
- const fileapi::FileSystemType src_type_;
- const fileapi::FileSystemType dest_type_;
+ const storage::FileSystemType src_type_;
+ const storage::FileSystemType dest_type_;
base::MessageLoopForIO message_loop_;
- scoped_refptr<fileapi::FileSystemContext> file_system_context_;
+ scoped_refptr<storage::FileSystemContext> file_system_context_;
scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_;
scoped_refptr<MockQuotaManager> quota_manager_;
TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleFile) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, MoveSingleFile) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleDirectory) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, MoveSingleDirectory) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, CopyDirectory) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, MoveDirectory) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest,
MoveDirectoryFailPostWriteValidation) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypeTest);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypeTest);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, CopySingleFileNoValidator) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypeTest);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypeTest);
helper.SetUpNoValidator();
FileSystemURL src = helper.SourceURL("a");
TEST(LocalFileSystemCopyOrMoveOperationTest, ProgressCallback) {
CopyOrMoveOperationTestHelper helper(GURL("http://foo"),
- fileapi::kFileSystemTypeTemporary,
- fileapi::kFileSystemTypePersistent);
+ storage::kFileSystemTypeTemporary,
+ storage::kFileSystemTypePersistent);
helper.SetUp();
FileSystemURL src = helper.SourceURL("a");
scoped_refptr<base::MessageLoopProxy> task_runner =
file_thread.message_loop_proxy();
- scoped_ptr<webkit_blob::FileStreamReader> reader(
- webkit_blob::FileStreamReader::CreateForLocalFile(
+ scoped_ptr<storage::FileStreamReader> reader(
+ storage::FileStreamReader::CreateForLocalFile(
task_runner.get(), source_path, 0, base::Time()));
scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
scoped_refptr<base::MessageLoopProxy> task_runner =
file_thread.message_loop_proxy();
- scoped_ptr<webkit_blob::FileStreamReader> reader(
- webkit_blob::FileStreamReader::CreateForLocalFile(
+ scoped_ptr<storage::FileStreamReader> reader(
+ storage::FileStreamReader::CreateForLocalFile(
task_runner.get(), source_path, 0, base::Time()));
scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
scoped_refptr<base::MessageLoopProxy> task_runner =
file_thread.message_loop_proxy();
- scoped_ptr<webkit_blob::FileStreamReader> reader(
- webkit_blob::FileStreamReader::CreateForLocalFile(
+ scoped_ptr<storage::FileStreamReader> reader(
+ storage::FileStreamReader::CreateForLocalFile(
task_runner.get(), source_path, 0, base::Time()));
scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(