FileSystem: Make SandboxDirectoryDatabase::DestroyDatabase non-static for cleanup

storage/browser/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 "storage/browser/fileapi/obfuscated_file_util.h"
 
 #include <queue>
 #include <string>
 #include <vector>
 
@@ skipping 904 matching lines @@
       origin_database_.get(), file_system_directory_);
 }
 
 bool ObfuscatedFileUtil::DestroyDirectoryDatabase(
     const GURL& origin,
     const std::string& type_string) {
   std::string key = GetDirectoryDatabaseKey(origin, type_string);
   if (key.empty())
     return true;
   DirectoryMap::iterator iter = directories_.find(key);
-  if (iter != directories_.end()) {
-    SandboxDirectoryDatabase* database = iter->second;
-    directories_.erase(iter);
-    delete database;
-  }
-
-  base::File::Error error = base::File::FILE_OK;
-  base::FilePath path = GetDirectoryForOriginAndType(
-      origin, type_string, false, &error);
-  if (path.empty() || error == base::File::FILE_ERROR_NOT_FOUND)
+  if (iter == directories_.end())
     return true;
-  return SandboxDirectoryDatabase::DestroyDatabase(path, env_override_);
+  scoped_ptr<SandboxDirectoryDatabase> database(iter->second);
+  directories_.erase(iter);
+  return database->DestroyDatabase();
 }
 
 // static
 int64 ObfuscatedFileUtil::ComputeFilePathCost(const base::FilePath& path) {
   return UsageForPath(VirtualPath::BaseName(path).value().size());
 }
 
 void ObfuscatedFileUtil::MaybePrepopulateDatabase(
     const std::vector<std::string>& type_strings_to_prepopulate) {
   SandboxPrioritizedOriginDatabase database(file_system_directory_,
@@ skipping 468 matching lines @@
   }
   return file.Pass();
 }
 
 bool ObfuscatedFileUtil::HasIsolatedStorage(const GURL& origin) {
   return special_storage_policy_.get() &&
       special_storage_policy_->HasIsolatedStorage(origin);
 }
 
 }  // namespace storage