| Index: webkit/browser/fileapi/sandbox_origin_database_unittest.cc
|
| diff --git a/webkit/browser/fileapi/sandbox_origin_database_unittest.cc b/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
|
| index 340baf22409de108b251615cd16111e5f11a974a..a4a40346df8e406015b58b1716f35ad47925910e 100644
|
| --- a/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
|
| +++ b/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
|
| @@ -15,7 +15,9 @@
|
| #include "base/stl_util.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "third_party/leveldatabase/src/db/filename.h"
|
| +#include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/db.h"
|
| +#include "third_party/leveldatabase/src/include/leveldb/env.h"
|
| #include "webkit/browser/fileapi/sandbox_database_test_helper.h"
|
| #include "webkit/browser/fileapi/sandbox_origin_database.h"
|
| #include "webkit/common/fileapi/file_system_util.h"
|
| @@ -35,8 +37,10 @@ TEST(SandboxOriginDatabaseTest, BasicTest) {
|
| const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
|
| EXPECT_FALSE(base::PathExists(kFSDir));
|
| EXPECT_TRUE(base::CreateDirectory(kFSDir));
|
| + scoped_ptr<leveldb::Env> in_memory_env(
|
| + leveldb::NewMemEnv(leveldb::Env::Default()));
|
|
|
| - SandboxOriginDatabase database(kFSDir);
|
| + SandboxOriginDatabase database(kFSDir, in_memory_env.get());
|
| std::string origin("origin");
|
|
|
| EXPECT_FALSE(database.HasOriginPath(origin));
|
| @@ -65,8 +69,10 @@ TEST(SandboxOriginDatabaseTest, TwoPathTest) {
|
| const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
|
| EXPECT_FALSE(base::PathExists(kFSDir));
|
| EXPECT_TRUE(base::CreateDirectory(kFSDir));
|
| + scoped_ptr<leveldb::Env> in_memory_env(
|
| + leveldb::NewMemEnv(leveldb::Env::Default()));
|
|
|
| - SandboxOriginDatabase database(kFSDir);
|
| + SandboxOriginDatabase database(kFSDir, in_memory_env.get());
|
| std::string origin0("origin0");
|
| std::string origin1("origin1");
|
|
|
| @@ -93,8 +99,10 @@ TEST(SandboxOriginDatabaseTest, DropDatabaseTest) {
|
| const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
|
| EXPECT_FALSE(base::PathExists(kFSDir));
|
| EXPECT_TRUE(base::CreateDirectory(kFSDir));
|
| + scoped_ptr<leveldb::Env> in_memory_env(
|
| + leveldb::NewMemEnv(leveldb::Env::Default()));
|
|
|
| - SandboxOriginDatabase database(kFSDir);
|
| + SandboxOriginDatabase database(kFSDir, in_memory_env.get());
|
| std::string origin("origin");
|
|
|
| EXPECT_FALSE(database.HasOriginPath(origin));
|
| @@ -121,8 +129,10 @@ TEST(SandboxOriginDatabaseTest, DeleteOriginTest) {
|
| const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
|
| EXPECT_FALSE(base::PathExists(kFSDir));
|
| EXPECT_TRUE(base::CreateDirectory(kFSDir));
|
| + scoped_ptr<leveldb::Env> in_memory_env(
|
| + leveldb::NewMemEnv(leveldb::Env::Default()));
|
|
|
| - SandboxOriginDatabase database(kFSDir);
|
| + SandboxOriginDatabase database(kFSDir, in_memory_env.get());
|
| std::string origin("origin");
|
|
|
| EXPECT_FALSE(database.HasOriginPath(origin));
|
| @@ -148,10 +158,12 @@ TEST(SandboxOriginDatabaseTest, ListOriginsTest) {
|
| const base::FilePath kFSDir = dir.path().Append(kFileSystemDirName);
|
| EXPECT_FALSE(base::PathExists(kFSDir));
|
| EXPECT_TRUE(base::CreateDirectory(kFSDir));
|
| + scoped_ptr<leveldb::Env> in_memory_env(
|
| + leveldb::NewMemEnv(leveldb::Env::Default()));
|
|
|
| std::vector<SandboxOriginDatabase::OriginRecord> origins;
|
|
|
| - SandboxOriginDatabase database(kFSDir);
|
| + SandboxOriginDatabase database(kFSDir, in_memory_env.get());
|
| EXPECT_TRUE(database.ListAllOrigins(&origins));
|
| EXPECT_TRUE(origins.empty());
|
| origins.clear();
|
| @@ -208,7 +220,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryTest) {
|
| };
|
|
|
| scoped_ptr<SandboxOriginDatabase> database(
|
| - new SandboxOriginDatabase(kFSDir));
|
| + new SandboxOriginDatabase(kFSDir, NULL));
|
| for (size_t i = 0; i < arraysize(kOrigins); ++i) {
|
| base::FilePath path;
|
| EXPECT_FALSE(database->HasOriginPath(kOrigins[i]));
|
| @@ -242,7 +254,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryTest) {
|
| CorruptDatabase(kDBDir, leveldb::kLogFile, -1, 1);
|
|
|
| base::FilePath path;
|
| - database.reset(new SandboxOriginDatabase(kFSDir));
|
| + database.reset(new SandboxOriginDatabase(kFSDir, NULL));
|
| std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
|
| EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));
|
|
|
| @@ -283,7 +295,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryForMissingDBFileTest) {
|
| base::FilePath path;
|
|
|
| scoped_ptr<SandboxOriginDatabase> database(
|
| - new SandboxOriginDatabase(kFSDir));
|
| + new SandboxOriginDatabase(kFSDir, NULL));
|
| EXPECT_FALSE(database->HasOriginPath(kOrigin));
|
| EXPECT_TRUE(database->GetPathForOrigin(kOrigin, &path));
|
| EXPECT_FALSE(path.empty());
|
| @@ -293,7 +305,7 @@ TEST(SandboxOriginDatabaseTest, DatabaseRecoveryForMissingDBFileTest) {
|
|
|
| DeleteDatabaseFile(kDBDir, kLevelDBFileTypes[i]);
|
|
|
| - database.reset(new SandboxOriginDatabase(kFSDir));
|
| + database.reset(new SandboxOriginDatabase(kFSDir, NULL));
|
| std::vector<SandboxOriginDatabase::OriginRecord> origins_in_db;
|
| EXPECT_TRUE(database->ListAllOrigins(&origins_in_db));
|
|
|
|
|