| Index: webkit/fileapi/file_system_origin_database_unittest.cc
|
| diff --git a/webkit/fileapi/file_system_origin_database_unittest.cc b/webkit/fileapi/file_system_origin_database_unittest.cc
|
| index 77bd3a8d37d63d829429e8c8c0d08d790298da07..beb17b6ff3fd8b934362160068d163a513c65ccf 100644
|
| --- a/webkit/fileapi/file_system_origin_database_unittest.cc
|
| +++ b/webkit/fileapi/file_system_origin_database_unittest.cc
|
| @@ -11,11 +11,8 @@
|
| #include "base/file_util.h"
|
| #include "base/platform_file.h"
|
| #include "base/scoped_temp_dir.h"
|
| -#include "base/stl_util.h"
|
| -#include "third_party/leveldatabase/src/db/filename.h"
|
| -#include "third_party/leveldatabase/src/include/leveldb/db.h"
|
| +#include "webkit/fileapi/file_system_database_test_helper.h"
|
| #include "webkit/fileapi/file_system_origin_database.h"
|
| -#include "webkit/fileapi/file_system_util.h"
|
|
|
| namespace fileapi {
|
|
|
| @@ -23,73 +20,6 @@ namespace {
|
| const FilePath::CharType kFileSystemDirName[] =
|
| FILE_PATH_LITERAL("File System");
|
| const FilePath::CharType kOriginDatabaseName[] = FILE_PATH_LITERAL("Origins");
|
| -
|
| -void CorruptDatabase(const FilePath& db_path,
|
| - leveldb::FileType type,
|
| - ptrdiff_t offset,
|
| - size_t size) {
|
| - file_util::FileEnumerator file_enum(
|
| - db_path, false /* recursive */,
|
| - static_cast<file_util::FileEnumerator::FileType>(
|
| - file_util::FileEnumerator::DIRECTORIES |
|
| - file_util::FileEnumerator::FILES));
|
| - FilePath file_path;
|
| - FilePath picked_file_path;
|
| - uint64 picked_file_number = kuint64max;
|
| -
|
| - while (!(file_path = file_enum.Next()).empty()) {
|
| - uint64 number = kuint64max;
|
| - leveldb::FileType file_type;
|
| - EXPECT_TRUE(leveldb::ParseFileName(FilePathToString(file_path.BaseName()),
|
| - &number, &file_type));
|
| - if (file_type == type &&
|
| - (picked_file_number == kuint64max || picked_file_number < number)) {
|
| - picked_file_path = file_path;
|
| - picked_file_number = number;
|
| - }
|
| - }
|
| -
|
| - EXPECT_FALSE(picked_file_path.empty());
|
| - EXPECT_NE(kuint64max, picked_file_number);
|
| -
|
| - bool created = true;
|
| - base::PlatformFileError error = base::PLATFORM_FILE_ERROR_FAILED;
|
| - base::PlatformFile file =
|
| - CreatePlatformFile(picked_file_path,
|
| - base::PLATFORM_FILE_OPEN |
|
| - base::PLATFORM_FILE_READ |
|
| - base::PLATFORM_FILE_WRITE,
|
| - &created, &error);
|
| - EXPECT_EQ(base::PLATFORM_FILE_OK, error);
|
| - EXPECT_FALSE(created);
|
| -
|
| - base::PlatformFileInfo file_info;
|
| - EXPECT_TRUE(base::GetPlatformFileInfo(file, &file_info));
|
| - if (offset < 0)
|
| - offset += file_info.size;
|
| - EXPECT_GE(offset, 0);
|
| - EXPECT_LE(offset, file_info.size);
|
| -
|
| - size = std::min(size, static_cast<size_t>(file_info.size - offset));
|
| -
|
| - std::vector<char> buf(size);
|
| - int read_size = base::ReadPlatformFile(file, offset,
|
| - vector_as_array(&buf), buf.size());
|
| - EXPECT_LT(0, read_size);
|
| - EXPECT_GE(buf.size(), static_cast<size_t>(read_size));
|
| - buf.resize(read_size);
|
| -
|
| - std::transform(buf.begin(), buf.end(), buf.begin(),
|
| - std::logical_not<char>());
|
| -
|
| - int written_size = base::WritePlatformFile(file, offset,
|
| - vector_as_array(&buf), buf.size());
|
| - EXPECT_GT(written_size, 0);
|
| - EXPECT_EQ(buf.size(), static_cast<size_t>(written_size));
|
| -
|
| - base::ClosePlatformFile(file);
|
| -}
|
| -
|
| }
|
|
|
| TEST(FileSystemOriginDatabaseTest, BasicTest) {
|
|
|