Moved deleting the indexed db context to the WebKitContext destructor.

chrome/browser/in_process_webkit/indexed_db_context.cc

 // Copyright (c) 2010 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 "chrome/browser/in_process_webkit/indexed_db_context.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
+#include "chrome/common/url_constants.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBFactory;
 using WebKit::WebSecurityOrigin;
 
 const FilePath::CharType IndexedDBContext::kIndexedDBDirectory[] =
     FILE_PATH_LITERAL("IndexedDB");
 
 const FilePath::CharType IndexedDBContext::kIndexedDBExtension[] =
     FILE_PATH_LITERAL(".indexeddb");
 
-IndexedDBContext::IndexedDBContext(WebKitContext* webkit_context)
-    : webkit_context_(webkit_context) {
+IndexedDBContext::IndexedDBContext(WebKitContext* webkit_context) {
+  data_path_ = webkit_context->data_path().Append(kIndexedDBDirectory);
 }
 
 IndexedDBContext::~IndexedDBContext() {
+  // Not being on the WEBKIT thread here means we are running in a unit test
+  // where no clean up is needed.
+  if (clear_local_state_on_exit_ &&
+      BrowserThread::CurrentlyOn(BrowserThread::WEBKIT))
+    ClearLocalState(data_path_, chrome::kExtensionScheme);

[jochen (gone - plz use gerrit), 2010/11/29 10:45:24]

indent only two spaces. also, ClearLocalState doesn't need to be a member of
IndexedDBContext. You could move it into an anonymous namespace at the top of
this file

[pastarmovj, 2010/11/29 12:50:37]

Done.

 }
 
 WebIDBFactory* IndexedDBContext::GetIDBFactory() {
   if (!idb_factory_.get())
     idb_factory_.reset(WebIDBFactory::create());
   DCHECK(idb_factory_.get());
   return idb_factory_.get();
 }
 
 FilePath IndexedDBContext::GetIndexedDBFilePath(
     const string16& origin_id) const {
-  FilePath storage_dir = webkit_context_->data_path().Append(
-      kIndexedDBDirectory);
   FilePath::StringType id = webkit_glue::WebStringToFilePathString(origin_id);
-  return storage_dir.Append(id.append(kIndexedDBExtension));
+  return data_path_;

[jochen (gone - plz use gerrit), 2010/11/29 10:45:24]

this method should return the complete filename, not just the directory

[pastarmovj, 2010/11/29 12:50:37]

Done. Sorry this was a mistake while I was cleaning up the code.

 }
 
-// static
-void IndexedDBContext::ClearLocalState(const FilePath& profile_path,
+void IndexedDBContext::ClearLocalState(const FilePath& indexeddb_path,
                                        const char* url_scheme_to_be_skipped) {
-  file_util::FileEnumerator file_enumerator(profile_path.Append(
-      kIndexedDBDirectory), false, file_util::FileEnumerator::FILES);
+  file_util::FileEnumerator file_enumerator(
+      indexeddb_path, false, file_util::FileEnumerator::FILES);
   // TODO(pastarmovj): We might need to consider exchanging this loop for
   // something more efficient in the future.
   for (FilePath file_path = file_enumerator.Next(); !file_path.empty();
        file_path = file_enumerator.Next()) {
     if (file_path.Extension() != IndexedDBContext::kIndexedDBExtension)
       continue;
     WebSecurityOrigin origin =
         WebSecurityOrigin::createFromDatabaseIdentifier(
             webkit_glue::FilePathToWebString(file_path.BaseName()));
     if (!EqualsASCII(origin.protocol(), url_scheme_to_be_skipped))
       file_util::Delete(file_path, false);
   }
 }
 
 void IndexedDBContext::DeleteIndexedDBFile(const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   // TODO(pastarmovj): Close all database connections that use that file.
   file_util::Delete(file_path, false);
 }
 
 void IndexedDBContext::DeleteIndexedDBForOrigin(const string16& origin_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT));
   // TODO(pastarmovj): Remove this check once we are safe to delete any time.
   FilePath idb_file = GetIndexedDBFilePath(origin_id);
   DCHECK_EQ(idb_file.BaseName().value().substr(0, strlen("chrome-extension")),
             FILE_PATH_LITERAL("chrome-extension"));
   DeleteIndexedDBFile(GetIndexedDBFilePath(origin_id));
 }