Moved deleting the indexed db context to the WebKitContext destructor.

chrome/browser/profile_impl.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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 255 matching lines @@
                             "profile files to the root directory!";
   create_session_service_timer_.Start(
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
   PrefService* prefs = GetPrefs();
   pref_change_registrar_.Init(prefs);
   pref_change_registrar_.Add(prefs::kSpellCheckDictionary, this);
   pref_change_registrar_.Add(prefs::kEnableSpellCheck, this);
   pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this);
+  pref_change_registrar_.Add(prefs::kClearSiteDataOnExit, this);
 
   // Convert active labs into switches. Modifies the current command line.
   about_flags::ConvertFlagsToSwitches(prefs, CommandLine::ForCurrentProcess());
 
   // It would be nice to use PathService for fetching this directory, but
   // the cache directory depends on the profile directory, which isn't available
   // to PathService.
   chrome::GetUserCacheDirectory(path_, &base_cache_path_);
   file_util::CreateDirectory(base_cache_path_);
 
@@ skipping 25 matching lines @@
       CommandLine::ForCurrentProcess()));
 #endif
 
   background_contents_service_.reset(
       new BackgroundContentsService(this, CommandLine::ForCurrentProcess()));
 
   extension_info_map_ = new ExtensionInfoMap();
 
   GetPolicyContext()->Initialize();
 
+  clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
+
   // Log the profile size after a reasonable startup delay.
   BrowserThread::PostDelayedTask(BrowserThread::FILE, FROM_HERE,
                                  new ProfileSizeTask(path_), 112000);
 
   InstantController::RecordMetrics(this);
 }
 
 void ProfileImpl::InitExtensions() {
   if (user_script_master_ || extensions_service_)
     return;  // Already initialized.
@@ skipping 828 matching lines @@
   spellcheck_host_ready_ = spellcheck_host_ &&
       (spellcheck_host_->bdict_file() != base::kInvalidPlatformFileValue ||
        spellcheck_host_->use_platform_spellchecker());
   NotificationService::current()->Notify(
       NotificationType::SPELLCHECK_HOST_REINITIALIZED,
           Source<Profile>(this), NotificationService::NoDetails());
 }
 
 WebKitContext* ProfileImpl::GetWebKitContext() {
   if (!webkit_context_.get())
-    webkit_context_ = new WebKitContext(this);
+    webkit_context_ = new WebKitContext(this, clear_local_state_on_exit_);
   DCHECK(webkit_context_.get());
   return webkit_context_.get();
 }
 
 DesktopNotificationService* ProfileImpl::GetDesktopNotificationService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!desktop_notification_service_.get()) {
      desktop_notification_service_.reset(new DesktopNotificationService(
          this, g_browser_process->notification_ui_manager()));
   }
@@ skipping 18 matching lines @@
     std::string* pref_name_in = Details<std::string>(details).ptr();
     PrefService* prefs = Source<PrefService>(source).ptr();
     DCHECK(pref_name_in && prefs);
     if (*pref_name_in == prefs::kSpellCheckDictionary ||
         *pref_name_in == prefs::kEnableSpellCheck) {
       ReinitializeSpellCheckHost(true);
     } else if (*pref_name_in == prefs::kEnableAutoSpellCorrect) {
       NotificationService::current()->Notify(
           NotificationType::SPELLCHECK_AUTOSPELL_TOGGLED,
               Source<Profile>(this), NotificationService::NoDetails());
+    } else if (*pref_name_in == prefs::kClearSiteDataOnExit) {
+      clear_local_state_on_exit_ =
+          prefs->GetBoolean(prefs::kClearSiteDataOnExit);
+      if (webkit_context_)
+        webkit_context_->set_clear_local_state_on_exit(
+            clear_local_state_on_exit_);
     }
   } else if (NotificationType::THEME_INSTALLED == type) {
     DCHECK_EQ(Source<Profile>(source).ptr(), GetOriginalProfile());
     const Extension* extension = Details<const Extension>(details).ptr();
     SetTheme(extension);
   } else if (NotificationType::BOOKMARK_MODEL_LOADED == type) {
     GetProfileSyncService();  // Causes lazy-load if sync is enabled.
     registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED,
                       Source<Profile>(this));
   }
@@ skipping 104 matching lines @@
   return chromeos_proxy_config_service_impl_;
 }
 #endif  // defined(OS_CHROMEOS)
 
 PrefProxyConfigTracker* ProfileImpl::GetProxyConfigTracker() {
   if (!pref_proxy_config_tracker_)
     pref_proxy_config_tracker_ = new PrefProxyConfigTracker(GetPrefs());
 
   return pref_proxy_config_tracker_;
 }