Remove usage of WebKitContext from chrome. This also cleans up the chrome code so that it only calls profile-wide operations (i.e. saving session/purging memory/clearing local state on exit) on the BrowserContext. The content layer takes care of calling the necessary objects on the right thread.

WebKitContext now does almost nothing and I'll remove it completely in the next change.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9462007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123509 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 9 deletions

diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data_remover.cc
index caf4c8c..8653ef0 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data_remover.cc
@@ -41,8 +41,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_data_remover.h"
@@ -61,6 +61,7 @@
 
 using content::BrowserContext;
 using content::BrowserThread;
+using content::DOMStorageContext;
 using content::DownloadManager;
 using content::UserMetricsAction;
 
@@ -300,14 +301,14 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask,
     }
   }
 
-  if (remove_mask & REMOVE_LOCAL_STORAGE) {
-    // Remove data such as local databases, STS state, etc. These only can
-    // be removed if a WEBKIT thread exists, so check that first:
-    if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
-      // We assume the end time is now.
-      BrowserContext::GetWebKitContext(profile_)->
-          DeleteDataModifiedSince(delete_begin_);
-    }
+  if (remove_mask & REMOVE_LOCAL_STORAGE &&
+      BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
+    DOMStorageContext* context =
+        DOMStorageContext::GetForBrowserContext(profile_);
+    BrowserThread::PostTask(
+        BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
+        base::Bind(&BrowsingDataRemover::ClearDOMStorageOnWebKitThread,
+                   base::Unretained(this), make_scoped_refptr(context)));
   }
 
   if (remove_mask & REMOVE_INDEXEDDB || remove_mask & REMOVE_WEBSQL ||
@@ -436,6 +437,12 @@ base::Time BrowsingDataRemover::CalculateBeginDeleteTime(
   return delete_begin_time - diff;
 }
 
+void BrowsingDataRemover::ClearDOMStorageOnWebKitThread(
+    scoped_refptr<DOMStorageContext> dom_storage_context) {
+  // We assume the end time is now.
+  dom_storage_context->DeleteDataModifiedSince(delete_begin_);
+}
+
 void BrowsingDataRemover::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {