Index: storage/browser/fileapi/sandbox_prioritized_origin_database.cc |
diff --git a/webkit/browser/fileapi/sandbox_prioritized_origin_database.cc b/storage/browser/fileapi/sandbox_prioritized_origin_database.cc |
similarity index 85% |
rename from webkit/browser/fileapi/sandbox_prioritized_origin_database.cc |
rename to storage/browser/fileapi/sandbox_prioritized_origin_database.cc |
index 55ce362a9b1d80da027708da030c867d919ed7c6..5731a853da2778d677a974fe05ac31bc1da410ab 100644 |
--- a/webkit/browser/fileapi/sandbox_prioritized_origin_database.cc |
+++ b/storage/browser/fileapi/sandbox_prioritized_origin_database.cc |
@@ -2,17 +2,17 @@ |
// 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_prioritized_origin_database.h" |
+#include "storage/browser/fileapi/sandbox_prioritized_origin_database.h" |
#include "base/file_util.h" |
#include "base/files/file.h" |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/pickle.h" |
-#include "webkit/browser/fileapi/sandbox_isolated_origin_database.h" |
-#include "webkit/browser/fileapi/sandbox_origin_database.h" |
+#include "storage/browser/fileapi/sandbox_isolated_origin_database.h" |
+#include "storage/browser/fileapi/sandbox_origin_database.h" |
-namespace fileapi { |
+namespace storage { |
namespace { |
@@ -35,8 +35,7 @@ bool WritePrimaryOriginFile(const base::FilePath& path, |
return true; |
} |
-bool ReadPrimaryOriginFile(const base::FilePath& path, |
- std::string* origin) { |
+bool ReadPrimaryOriginFile(const base::FilePath& path, std::string* origin) { |
std::string buffer; |
if (!base::ReadFileToString(path, &buffer)) |
return false; |
@@ -52,8 +51,7 @@ SandboxPrioritizedOriginDatabase::SandboxPrioritizedOriginDatabase( |
leveldb::Env* env_override) |
: file_system_directory_(file_system_directory), |
env_override_(env_override), |
- primary_origin_file_( |
- file_system_directory_.Append(kPrimaryOriginFile)) { |
+ primary_origin_file_(file_system_directory_.Append(kPrimaryOriginFile)) { |
} |
SandboxPrioritizedOriginDatabase::~SandboxPrioritizedOriginDatabase() { |
@@ -64,11 +62,8 @@ bool SandboxPrioritizedOriginDatabase::InitializePrimaryOrigin( |
if (!primary_origin_database_) { |
if (!MaybeLoadPrimaryOrigin() && ResetPrimaryOrigin(origin)) { |
MaybeMigrateDatabase(origin); |
- primary_origin_database_.reset( |
- new SandboxIsolatedOriginDatabase( |
- origin, |
- file_system_directory_, |
- base::FilePath(kPrimaryDirectory))); |
+ primary_origin_database_.reset(new SandboxIsolatedOriginDatabase( |
+ origin, file_system_directory_, base::FilePath(kPrimaryDirectory))); |
return true; |
} |
} |
@@ -98,7 +93,8 @@ bool SandboxPrioritizedOriginDatabase::HasOriginPath( |
} |
bool SandboxPrioritizedOriginDatabase::GetPathForOrigin( |
- const std::string& origin, base::FilePath* directory) { |
+ const std::string& origin, |
+ base::FilePath* directory) { |
MaybeInitializeDatabases(true); |
if (primary_origin_database_ && |
primary_origin_database_->GetPathForOrigin(origin, directory)) |
@@ -145,11 +141,8 @@ bool SandboxPrioritizedOriginDatabase::MaybeLoadPrimaryOrigin() { |
std::string saved_origin; |
if (!ReadPrimaryOriginFile(primary_origin_file_, &saved_origin)) |
return false; |
- primary_origin_database_.reset( |
- new SandboxIsolatedOriginDatabase( |
- saved_origin, |
- file_system_directory_, |
- base::FilePath(kPrimaryDirectory))); |
+ primary_origin_database_.reset(new SandboxIsolatedOriginDatabase( |
+ saved_origin, file_system_directory_, base::FilePath(kPrimaryDirectory))); |
return true; |
} |
@@ -195,8 +188,7 @@ void SandboxPrioritizedOriginDatabase::MaybeMigrateDatabase( |
} |
} |
-void SandboxPrioritizedOriginDatabase::MaybeInitializeDatabases( |
- bool create) { |
+void SandboxPrioritizedOriginDatabase::MaybeInitializeDatabases(bool create) { |
MaybeLoadPrimaryOrigin(); |
MaybeInitializeNonPrimaryDatabase(create); |
} |
@@ -206,8 +198,8 @@ void SandboxPrioritizedOriginDatabase::MaybeInitializeNonPrimaryDatabase( |
if (origin_database_) |
return; |
- origin_database_.reset(new SandboxOriginDatabase(file_system_directory_, |
- env_override_)); |
+ origin_database_.reset( |
+ new SandboxOriginDatabase(file_system_directory_, env_override_)); |
if (!create && !base::DirectoryExists(origin_database_->GetDatabasePath())) { |
origin_database_.reset(); |
return; |
@@ -220,4 +212,4 @@ SandboxPrioritizedOriginDatabase::GetSandboxOriginDatabase() { |
return origin_database_.get(); |
} |
-} // namespace fileapi |
+} // namespace storage |