Add database recovery for FileSystemOriginDatabase

BUG=103018,116615
TEST=FileSystemOriginDatabase.DatabaseRecoveryTest


Review URL: http://codereview.chromium.org/9663021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129631 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 7 deletions

diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc
index 2a30dc0..b9a3334 100644
--- a/webkit/fileapi/obfuscated_file_util.cc
+++ b/webkit/fileapi/obfuscated_file_util.cc
@@ -31,9 +31,6 @@ namespace {
 
 const int64 kFlushDelaySeconds = 10 * 60;  // 10 minutes
 
-const char kOriginDatabaseName[] = "Origins";
-const char kDirectoryDatabaseName[] = "Paths";
-
 void InitFileInfo(
     FileSystemDirectoryDatabase::FileInfo* file_info,
     FileSystemDirectoryDatabase::FileId parent_id,
@@ -991,7 +988,6 @@ bool ObfuscatedFileUtil::DestroyDirectoryDatabase(
     return true;
   if (!file_util::DirectoryExists(path))
     return true;
-  path = path.AppendASCII(kDirectoryDatabaseName);
   return FileSystemDirectoryDatabase::DestroyDatabase(path);
 }
 
@@ -1202,7 +1198,6 @@ FileSystemDirectoryDatabase* ObfuscatedFileUtil::GetDirectoryDatabase(
     }
   }
   MarkUsed();
-  path = path.AppendASCII(kDirectoryDatabaseName);
   FileSystemDirectoryDatabase* database = new FileSystemDirectoryDatabase(path);
   directories_[key] = database;
   return database;
@@ -1262,8 +1257,7 @@ bool ObfuscatedFileUtil::InitOriginDatabase(bool create) {
       return false;
     }
     origin_database_.reset(
-        new FileSystemOriginDatabase(
-            file_system_directory_.AppendASCII(kOriginDatabaseName)));
+        new FileSystemOriginDatabase(file_system_directory_));
   }
   return true;
 }