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

storage/browser/fileapi/obfuscated_file_util.cc

Index: storage/browser/fileapi/obfuscated_file_util.cc
diff --git a/storage/browser/fileapi/obfuscated_file_util.cc b/storage/browser/fileapi/obfuscated_file_util.cc
index 8c02dd11bf4a18e2fbcbd7ab2bdc0edbd6b6a1ca..4e202ebb68bf9d12779e11e72cf6f869e4d5f250 100644
--- a/storage/browser/fileapi/obfuscated_file_util.cc
+++ b/storage/browser/fileapi/obfuscated_file_util.cc
@@ -922,18 +922,11 @@ bool ObfuscatedFileUtil::DestroyDirectoryDatabase(
   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