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

storage/browser/fileapi/sandbox_directory_database.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/sandbox_directory_database.h"
 
 #include <math.h>
 #include <algorithm>
 #include <set>
 #include <stack>
@@ skipping 683 matching lines @@
     HandleError(FROM_HERE, status);
     return false;
   }
   // The database must not yet exist; initialize it.
   if (!StoreDefaultValues())
     return false;
 
   return GetNextInteger(next);
 }
 
-// static
-bool SandboxDirectoryDatabase::DestroyDatabase(const base::FilePath& path,
-                                               leveldb::Env* env_override) {
-  std::string name  = FilePathToString(path.Append(kDirectoryDatabaseName));
+bool SandboxDirectoryDatabase::DestroyDatabase() {
+  db_.reset();
+  const std::string path =
+      FilePathToString(filesystem_data_directory_.Append(
+          kDirectoryDatabaseName));
   leveldb::Options options;
-  if (env_override)
-    options.env = env_override;
-  leveldb::Status status = leveldb::DestroyDB(name, options);
+  if (env_override_)
+    options.env = env_override_;
+  leveldb::Status status = leveldb::DestroyDB(path, options);
   if (status.ok())
     return true;
   LOG(WARNING) << "Failed to destroy a database with status " <<
       status.ToString();
   return false;
 }
 
 bool SandboxDirectoryDatabase::Init(RecoveryOption recovery_option) {
   if (db_)
     return true;
@@ skipping 208 matching lines @@
 
 void SandboxDirectoryDatabase::HandleError(
     const tracked_objects::Location& from_here,
     const leveldb::Status& status) {
   LOG(ERROR) << "SandboxDirectoryDatabase failed at: "
              << from_here.ToString() << " with error: " << status.ToString();
   db_.reset();
 }
 
 }  // namespace storage