Merge 129631 - Add database recovery for FileSystemOriginDatabase

webkit/fileapi/obfuscated_file_util.cc

 // Copyright (c) 2012 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/obfuscated_file_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 13 matching lines @@
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
 
 namespace {
 
 const int64 kFlushDelaySeconds = 10 * 60;  // 10 minutes
 
-const char kOriginDatabaseName[] = "Origins";
-const char kDirectoryDatabaseName[] = "Paths";
-
 void InitFileInfo(
     FileSystemDirectoryDatabase::FileInfo* file_info,
     FileSystemDirectoryDatabase::FileId parent_id,
     const FilePath::StringType& file_name) {
   DCHECK(file_info);
   file_info->parent_id = parent_id;
   file_info->name = file_name;
 }
 
 bool IsRootDirectory(const FileSystemPath& virtual_path) {
@@ skipping 937 matching lines @@
     FileSystemDirectoryDatabase* database = iter->second;
     directories_.erase(iter);
     delete database;
   }
 
   FilePath path = GetDirectoryForOriginAndType(origin, type, false);
   if (path.empty())
     return true;
   if (!file_util::DirectoryExists(path))
     return true;
-  path = path.AppendASCII(kDirectoryDatabaseName);
   return FileSystemDirectoryDatabase::DestroyDatabase(path);
 }
 
 // static
 int64 ObfuscatedFileUtil::ComputeFilePathCost(const FilePath& path) {
   return GetPathQuotaUsage(1, VirtualPath::BaseName(path).value().size());
 }
 
 PlatformFileError ObfuscatedFileUtil::GetFileInfoInternal(
     FileSystemDirectoryDatabase* db,
@@ skipping 190 matching lines @@
   FilePath path = GetDirectoryForOriginAndType(origin, type, create);
   if (path.empty())
     return NULL;
   if (!file_util::DirectoryExists(path)) {
     if (!file_util::CreateDirectory(path)) {
       LOG(WARNING) << "Failed to origin+type directory: " << path.value();
       return NULL;
     }
   }
   MarkUsed();
-  path = path.AppendASCII(kDirectoryDatabaseName);
   FileSystemDirectoryDatabase* database = new FileSystemDirectoryDatabase(path);
   directories_[key] = database;
   return database;
 }
 
 FilePath ObfuscatedFileUtil::GetDirectoryForOrigin(
     const GURL& origin, bool create) {
   if (!InitOriginDatabase(create))
     return FilePath();
   FilePath directory_name;
@@ skipping 39 matching lines @@
 bool ObfuscatedFileUtil::InitOriginDatabase(bool create) {
   if (!origin_database_.get()) {
     if (!create && !file_util::DirectoryExists(file_system_directory_))
       return false;
     if (!file_util::CreateDirectory(file_system_directory_)) {
       LOG(WARNING) << "Failed to create FileSystem directory: " <<
           file_system_directory_.value();
       return false;
     }
     origin_database_.reset(
-        new FileSystemOriginDatabase(
-            file_system_directory_.AppendASCII(kOriginDatabaseName)));
+        new FileSystemOriginDatabase(file_system_directory_));
   }
   return true;
 }
 
 }  // namespace fileapi