Add database recovery for FileSystemOriginDatabase

webkit/fileapi/file_system_directory_database.h

Index: webkit/fileapi/file_system_directory_database.h
diff --git a/webkit/fileapi/file_system_directory_database.h b/webkit/fileapi/file_system_directory_database.h
index 1c760b8e3fd8c487e708a8830553f0c576a625ce..d3776bb3f25e5b108d49e2f0326750787d8ee372 100644
--- a/webkit/fileapi/file_system_directory_database.h
+++ b/webkit/fileapi/file_system_directory_database.h
@@ -55,7 +55,7 @@ class FileSystemDirectoryDatabase {
     base::Time modification_time;
   };
 
-  explicit FileSystemDirectoryDatabase(const FilePath& path);
+  explicit FileSystemDirectoryDatabase(const FilePath& origin_data_directory);
   ~FileSystemDirectoryDatabase();
 
   bool GetChildWithName(
@@ -87,7 +87,12 @@ class FileSystemDirectoryDatabase {
   static bool DestroyDatabase(const FilePath& path);
 
  private:
-  bool Init();
+  enum RecoveryOption {
+    DELETE_ON_CORRUPTION,
+    FAIL_ON_CORRUPTION,
+  };
+
+  bool Init(RecoveryOption recovery_option);
   bool StoreDefaultValues();
   bool GetLastFileId(FileId* file_id);
   bool VerifyIsDirectory(FileId file_id);
@@ -97,7 +102,7 @@ class FileSystemDirectoryDatabase {
   void HandleError(const tracked_objects::Location& from_here,
                    leveldb::Status status);
 
-  std::string path_;
+  FilePath origin_data_directory_;

[ericu, 2012/03/26 18:39:18]

It's not really the origin data directory, since it's specific to a filesystem
type [temporary, persistent].  Sandbox wasn't the best name for it either, I
admit.  How about filesystem_data_directory?  Or do you think that would sound
like the top-level FileSystem directory, rather than the directory for a
specific filesystem?

[tzik, 2012/03/27 02:44:18]

Done. It looks a bit confusing, yet semantically correct.

   scoped_ptr<leveldb::DB> db_;
 };