Add database recovery for FileSystemOriginDatabase

webkit/fileapi/file_system_directory_database.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 37 matching lines @@
 
     FileId parent_id;
     FilePath data_path;
     FilePath::StringType name;
     // This modification time is valid only for directories, not files, as
     // FileWriter will get the files out of sync.
     // For files, look at the modification time of the underlying data_path.
     base::Time modification_time;
   };
 
-  explicit FileSystemDirectoryDatabase(const FilePath& path);
+  explicit FileSystemDirectoryDatabase(const FilePath& origin_data_directory);
   ~FileSystemDirectoryDatabase();
 
   bool GetChildWithName(
       FileId parent_id, const FilePath::StringType& name, FileId* child_id);
   bool GetFileWithPath(const FilePath& path, FileId* file_id);
   // ListChildren will succeed, returning 0 children, if parent_id doesn't
   // exist.
   bool ListChildren(FileId parent_id, std::vector<FileId>* children);
   bool GetFileInfo(FileId file_id, FileInfo* info);
   bool AddFileInfo(const FileInfo& info, FileId* file_id);
@@ skipping 11 matching lines @@
   bool OverwritingMoveFile(FileId src_file_id, FileId dest_file_id);
 
   // This produces the series 0, 1, 2..., starting at 0 when the underlying
   // filesystem is first created, and maintaining state across
   // creation/destruction of FileSystemDirectoryDatabase objects.
   bool GetNextInteger(int64* next);
 
   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);
   bool AddFileInfoHelper(
       const FileInfo& info, FileId file_id, leveldb::WriteBatch* batch);
   bool RemoveFileInfoHelper(FileId file_id, leveldb::WriteBatch* batch);
   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_;
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_DIRECTORY_DATABASE_H_