Add database recovery for FileSystemOriginDatabase

webkit/fileapi/file_system_directory_database_unittest.cc

Index: webkit/fileapi/file_system_directory_database_unittest.cc
diff --git a/webkit/fileapi/file_system_directory_database_unittest.cc b/webkit/fileapi/file_system_directory_database_unittest.cc
index 3a47c91c8d0ca286439120e87466bca7cd35964e..96f979c1f87597874e1665b3d83a1459c964e011 100644
--- a/webkit/fileapi/file_system_directory_database_unittest.cc
+++ b/webkit/fileapi/file_system_directory_database_unittest.cc
@@ -30,8 +30,7 @@ class FileSystemDirectoryDatabaseTest : public testing::Test {
 
   void InitDatabase() {
     db_.reset();
-    FilePath path = base_.path().AppendASCII("db");
-    db_.reset(new FileSystemDirectoryDatabase(path));
+    db_.reset(new FileSystemDirectoryDatabase(sandbox_path()));

[kinuko, 2012/03/26 05:25:09]

Do we need first db_.reset() on line 31?

[tzik, 2012/03/26 08:04:56]

Yes, we need.
Without it, we make two FileSystemDirectoryDatabase object for the directory at
the moment.

   }
 
   bool AddFileInfo(FileId parent_id, const FilePath::StringType& name) {
@@ -42,6 +41,10 @@ class FileSystemDirectoryDatabaseTest : public testing::Test {
     return db_->AddFileInfo(info, &file_id);
   }
 
+  FilePath sandbox_path() const {

[kinuko, 2012/03/26 05:25:09]

It's not used anywhere other than in InitDatabase?  Then maybe we do not need
this method?

[tzik, 2012/03/26 08:04:56]

Done.

+    return base_.path();
+  }
+
  protected:
   // Common temp base for nondestructive uses.
   ScopedTempDir base_;