Add database recovery for FileSystemOriginDatabase

webkit/fileapi/file_system_directory_database_unittest.cc

 // 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.
 
 #include "webkit/fileapi/file_system_directory_database.h"
 
 #include <math.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 12 matching lines @@
     EXPECT_TRUE(base_.CreateUniqueTempDir());
     InitDatabase();
   }
 
   FileSystemDirectoryDatabase* db() {
     return db_.get();
   }
 
   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) {
     FileId file_id;
     FileInfo info;
     info.parent_id = parent_id;
     info.name = name;
     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_;
   scoped_ptr<FileSystemDirectoryDatabase> db_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemDirectoryDatabaseTest);
 };
 
 TEST_F(FileSystemDirectoryDatabaseTest, TestMissingFileGetInfo) {
   FileId file_id = 888;
@@ skipping 356 matching lines @@
   EXPECT_TRUE(db()->GetNextInteger(&next));
   EXPECT_EQ(2, next);
   EXPECT_TRUE(db()->GetNextInteger(&next));
   EXPECT_EQ(3, next);
   InitDatabase();
   EXPECT_TRUE(db()->GetNextInteger(&next));
   EXPECT_EQ(4, next);
 }
 
 }  // namespace fileapi