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

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 62 matching lines @@
 #include "content/browser/debugger/devtools_protocol_handler.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/common/notification_service.h"
 #include "ipc/ipc_logging.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/database/database_tracker.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
 #endif
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 #include "content/common/child_process_messages.h"
 #endif
 
@@ skipping 48 matching lines @@
   print_job_manager_.reset(new printing::PrintJobManager);
 
   net_log_.reset(new ChromeNetLog);
 
   extension_event_router_forwarder_ = new ExtensionEventRouterForwarder;
 
   ExtensionTabIdMap::GetInstance()->Init();
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
-  FilePath profile_path;
-  bool clear_local_state_on_exit;
-
-  // Store the profile path for clearing local state data on exit.
-  clear_local_state_on_exit = ShouldClearLocalState(&profile_path);
-
 #if defined(OS_CHROMEOS)
   if (web_socket_proxy_thread_.get())
     chromeos::WebSocketProxyController::Shutdown();
   web_socket_proxy_thread_.reset();
 #endif
 
   // Delete the AutomationProviderList before NotificationService,
   // since it may try to unregister notifications
   // Both NotificationService and AutomationProvider are singleton instances in
   // the BrowserProcess. Since AutomationProvider may have some active
@@ skipping 92 matching lines @@
   print_job_manager_->OnQuit();
   print_job_manager_.reset();
 
   // Destroy TabCloseableStateWatcher before NotificationService since the
   // former registers for notifications.
   tab_closeable_state_watcher_.reset();
 
   // Now OK to destroy NotificationService.
   main_notification_service_.reset();
 
-  // Prior to clearing local state, we want to complete tasks pending
-  // on the db thread too.
-  db_thread_.reset();
-
   // Stop the watchdog thread after stopping other threads.
   watchdog_thread_.reset();
 
-  // At this point, no render process exist and the file, io, db, and
-  // webkit threads in this process have all terminated, so it's safe
-  // to access local state data such as cookies, database, or local storage.
-  if (clear_local_state_on_exit)
-    ClearLocalState(profile_path);
-
   g_browser_process = NULL;
 }
 
 #if defined(OS_WIN)
 // Send a QuitTask to the given MessageLoop.
 static void PostQuit(MessageLoop* message_loop) {
   message_loop->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 #elif defined(USE_X11)
 static void Signal(base::WaitableEvent* event) {
@@ skipping 373 matching lines @@
   return prerender_tracker_.get();
 }
 
 MHTMLGenerationManager* BrowserProcessImpl::mhtml_generation_manager() {
   if (!mhtml_generation_manager_.get())
     mhtml_generation_manager_ = new MHTMLGenerationManager();
 
   return mhtml_generation_manager_.get();
 }
 
-void BrowserProcessImpl::ClearLocalState(const FilePath& profile_path) {
-  webkit_database::DatabaseTracker::ClearLocalState(profile_path);
-}
-
-bool BrowserProcessImpl::ShouldClearLocalState(FilePath* profile_path) {
-  FilePath user_data_dir;
-  Profile* profile;
-
-  // Check for the existence of a profile manager. When quitting early,
-  // e.g. because another chrome instance is running, or when invoked with
-  // options such as --uninstall or --try-chrome-again=0, the profile manager
-  // does not exist yet.
-  if (!profile_manager_.get())
-    return false;
-
-  PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-  profile = profile_manager_->GetDefaultProfile(user_data_dir);
-  if (!profile)
-    return false;
-  *profile_path = profile->GetPath();
-  return profile->GetPrefs()->GetBoolean(prefs::kClearSiteDataOnExit);
-}
-
 void BrowserProcessImpl::CreateResourceDispatcherHost() {
   DCHECK(!created_resource_dispatcher_host_ &&
          resource_dispatcher_host_.get() == NULL);
   created_resource_dispatcher_host_ = true;
 
   // UserScriptListener will delete itself.
   ResourceQueue::DelegateSet resource_queue_delegates;
   resource_queue_delegates.insert(new UserScriptListener());
 
   resource_dispatcher_host_.reset(
@@ skipping 399 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)