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

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 247 matching lines @@
 
     ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableFunction(
             &NotifyOTRProfileDestroyedOnIOThread,
             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);
 
     if (pref_proxy_config_tracker_)
       pref_proxy_config_tracker_->DetachFromPrefService();
 
     ExtensionService* extension_service = GetExtensionService();
     if (extension_service) {
       ExtensionPrefs* extension_prefs = extension_service->extension_prefs();
       extension_prefs->ClearIncognitoSessionOnlyContentSettings();
@@ skipping 447 matching lines @@
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
         GetExtensionSpecialStoragePolicy());
 
     // Each consumer is responsible for registering its QuotaClient during
     // its construction.
     file_system_context_ = CreateFileSystemContext(
         GetPath(), IsOffTheRecord(),
         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(
         IsOffTheRecord(), GetPath(), GetExtensionSpecialStoragePolicy(),
         false, quota_manager_->proxy(),
         BrowserThread::GetMessageLoopProxyForThread(BrowserThread::WEBKIT));
     appcache_service_ = new ChromeAppCacheService(quota_manager_->proxy());
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         NewRunnableMethod(
@@ skipping 95 matching lines @@
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }