Move code to clear web databases on shutdown to the database tracker

chrome/browser/profiles/profile.cc

Index: chrome/browser/profiles/profile.cc
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index b8f90a5d3714c0551d185096c0e1d50abc7b77ca..2d63a0cb1f0a92884882d8013301399f48622259 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -265,12 +265,13 @@ class OffTheRecordProfileImpl : public Profile,
             profile_->GetRuntimeId(), GetRuntimeId()));
 
     // Clean up all DB files/directories
-    if (db_tracker_)
+    if (db_tracker_) {
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(
               db_tracker_.get(),
-              &webkit_database::DatabaseTracker::DeleteIncognitoDBDirectory));
+              &webkit_database::DatabaseTracker::Shutdown));
+    }
 
     BrowserList::RemoveObserver(this);
 
@@ -738,7 +739,7 @@ class OffTheRecordProfileImpl : public Profile,
         GetExtensionSpecialStoragePolicy(),
         quota_manager_->proxy());
     db_tracker_ = new webkit_database::DatabaseTracker(
-        GetPath(), IsOffTheRecord(), GetExtensionSpecialStoragePolicy(),
+        GetPath(), IsOffTheRecord(), false, GetExtensionSpecialStoragePolicy(),
         quota_manager_->proxy(),
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
     webkit_context_ = new WebKitContext(