Moved deleting the indexed db context to the WebKitContext destructor.

chrome/browser/in_process_webkit/webkit_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/webkit_context.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/notification_details.h"
+#include "chrome/common/notification_type.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 
 WebKitContext::WebKitContext(Profile* profile)
     : data_path_(profile->IsOffTheRecord() ? FilePath() : profile->GetPath()),
       is_incognito_(profile->IsOffTheRecord()),
+      profile_(profile),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           dom_storage_context_(new DOMStorageContext(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           indexed_db_context_(new IndexedDBContext(this))) {
+  PrefService* prefs = profile->GetPrefs();
+  clear_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
+  pref_change_registrar_.Init(prefs);
+  pref_change_registrar_.Add(prefs::kClearSiteDataOnExit, this);
 }
 
 WebKitContext::~WebKitContext() {
   // If the WebKit thread was ever spun up, delete the object there.  The task
   // will just get deleted if the WebKit thread isn't created (which only
   // happens during testing).
   DOMStorageContext* dom_storage_context = dom_storage_context_.release();
   if (!BrowserThread::DeleteSoon(
           BrowserThread::WEBKIT, FROM_HERE, dom_storage_context)) {
     // The WebKit thread wasn't created, and the task got deleted without
     // freeing the DOMStorageContext, so delete it manually.
     delete dom_storage_context;
   }
 
+  if (clear_on_exit()) {

[jochen (gone - plz use gerrit), 2010/11/27 19:02:27]

since we're explicitly deleting the context, you could push to value of
clear_on_exit to the indexed db context and clear the local state in indexed
db's destructor. then you also won't need the lock

[pastarmovj, 2010/11/27 20:45:15]

Done. 

As a result I had to push(done upon construction) the data_path value as well.
However what I realized is that as this is the only peace of information needed
from the webkit context we can remove the pointer to it from the indexed db
context.

+    const char* url_scheme_skipped = chrome::kExtensionScheme;
+    BrowserThread::PostTask(
+         BrowserThread::WEBKIT, FROM_HERE,
+         NewRunnableFunction(&IndexedDBContext::ClearLocalState,
+                             data_path_, url_scheme_skipped));
+  }
   IndexedDBContext* indexed_db_context = indexed_db_context_.release();
   if (!BrowserThread::DeleteSoon(
           BrowserThread::WEBKIT, FROM_HERE, indexed_db_context)) {
     delete indexed_db_context;
   }
 }
 
+bool WebKitContext::clear_on_exit() const {
+  AutoLock auto_lock(lock_);
+  return clear_on_exit_;

[pastarmovj, 2010/11/27 20:45:15]

Not needed anymore.

+}
+
 void WebKitContext::PurgeMemory() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)) {
     BrowserThread::PostTask(
         BrowserThread::WEBKIT, FROM_HERE,
         NewRunnableMethod(this, &WebKitContext::PurgeMemory));
     return;
   }
 
   dom_storage_context_->PurgeMemory();
 }
@@ skipping 21 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::WEBKIT, FROM_HERE,
         NewRunnableMethod(this, &WebKitContext::DeleteSessionStorageNamespace,
                           session_storage_namespace_id));
     return;
   }
 
   dom_storage_context_->DeleteSessionStorageNamespace(
       session_storage_namespace_id);
 }
+
+void WebKitContext::Observe(NotificationType type,
+                            const NotificationSource& source,
+                            const NotificationDetails& details) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

[jochen (gone - plz use gerrit), 2010/11/27 19:02:27]

that shouldn't be required

[pastarmovj, 2010/11/27 20:45:15]

Removed it. 

+
+  if (NotificationType::PREF_CHANGED == type) {
+    std::string* name = Details<std::string>(details).ptr();
+    if (prefs::kClearSiteDataOnExit == *name) {
+      AutoLock auto_lock(lock_);
+      clear_on_exit_ = profile_->GetPrefs()->GetBoolean(
+          prefs::kClearSiteDataOnExit);
+      LOG(WARNING) << "Option changed " << clear_on_exit_;

[jochen (gone - plz use gerrit), 2010/11/27 19:02:27]

please remove

[pastarmovj, 2010/11/27 20:45:15]

Done. It was debug output to test if it is getting properly called.

+    }
+  }
+}