Add database recovery for FileSystemOriginDatabase

webkit/fileapi/file_system_origin_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_ORIGIN_DATABASE_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_ORIGIN_DATABASE_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 16 matching lines @@
     std::string origin;
     FilePath path;
 
     OriginRecord();
     OriginRecord(const std::string& origin, const FilePath& path);
     ~OriginRecord();
   };
 
   // Only one instance of FileSystemOriginDatabase should exist for a given path
   // at a given time.
-  explicit FileSystemOriginDatabase(const FilePath& path);
+  explicit FileSystemOriginDatabase(const FilePath& file_system_directory);
   ~FileSystemOriginDatabase();
 
   bool HasOriginPath(const std::string& origin);
 
   // This will produce a unique path and add it to its database, if it's not
   // already present.
   bool GetPathForOrigin(const std::string& origin, FilePath* directory);
 
   // Also returns success if the origin is not found.
   bool RemovePathForOrigin(const std::string& origin);
 
   bool ListAllOrigins(std::vector<OriginRecord>* origins);
 
   // This will release all database resources in use; call it to save memory.
   void DropDatabase();
 
  private:
-  bool Init();
+  enum RecoveryOption {
+    REPAIR_ON_CORRUPTION,
+    DELETE_ON_CORRUPTION,
+    FAIL_ON_CORRUPTION,
+  };
+
+  bool Init(RecoveryOption recovery_option);
+  bool RepairDB(const std::string& db_path);

[kinuko, 2012/03/23 04:01:33]

LevelDB's method name is RepairDB but in this class looks like we use 'Database'
rather than 'DB'... RepairDatabase might be better for the consistency?

[tzik, 2012/03/23 07:09:00]

Done.

   void HandleError(const tracked_objects::Location& from_here,
                    leveldb::Status status);
   bool GetLastPathNumber(int* number);
 
-  std::string path_;
+  FilePath file_system_directory_;
   scoped_ptr<leveldb::DB> db_;
   DISALLOW_COPY_AND_ASSIGN(FileSystemOriginDatabase);
 };
 
 }  // namespace fileapi
 
 #endif  // WEBKIT_FILEAPI_FILE_SYSTEM_ORIGIN_DATABASE_H_