Make the content::DOMStorageContext methods callable on the main thread and hide the threading deta…

chrome/browser/browsing_data_remover.cc

 // Copyright (c) 2012 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/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 285 matching lines @@
     if (rq_context) {
       waiting_for_clear_origin_bound_certs_ = true;
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&BrowsingDataRemover::ClearOriginBoundCertsOnIOThread,
                      base::Unretained(this), base::Unretained(rq_context)));
     }
   }
 
   if (remove_mask & REMOVE_LOCAL_STORAGE) {
-    DOMStorageContext* context = BrowserContext::GetDOMStorageContext(profile_);
-    context->task_runner()->PostTask(
-        FROM_HERE,
-        base::Bind(&BrowsingDataRemover::ClearDOMStorageInSequencedTask,
-                   base::Unretained(this), make_scoped_refptr(context)));
+    BrowserContext::GetDOMStorageContext(profile_)->DeleteDataModifiedSince(
+        delete_begin_);
   }
 
   if (remove_mask & REMOVE_INDEXEDDB || remove_mask & REMOVE_WEBSQL ||
       remove_mask & REMOVE_APPCACHE || remove_mask & REMOVE_FILE_SYSTEMS) {
     if (!quota_manager_)
       quota_manager_ = content::BrowserContext::GetQuotaManager(profile_);
     waiting_for_clear_quota_managed_data_ = true;
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&BrowsingDataRemover::ClearQuotaManagedDataOnIOThread,
@@ skipping 108 matching lines @@
     case EVERYTHING:
       delete_begin_time = base::Time();
       break;
     default:
       NOTREACHED() << L"Missing item";
       break;
   }
   return delete_begin_time - diff;
 }
 
-void BrowsingDataRemover::ClearDOMStorageInSequencedTask(
-    DOMStorageContext* dom_storage_context) {
-  // We assume the end time is now.
-  DCHECK(dom_storage_context->task_runner()->RunsTasksOnCurrentThread());
-  dom_storage_context->DeleteDataModifiedSince(delete_begin_);
-}
-
 void BrowsingDataRemover::Observe(int type,
                                   const content::NotificationSource& source,
                                   const content::NotificationDetails& details) {
   // TODO(brettw) bug 1139736: This should also observe session
   // clearing (what about other things such as passwords, etc.?) and wait for
   // them to complete before continuing.
   DCHECK(type == chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED);
   TemplateURLService* model = content::Source<TemplateURLService>(source).ptr();
   if (model->profile() == profile_) {
     registrar_.RemoveAll();
@@ skipping 257 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataRemover::OnClearedOriginBoundCerts,
                  base::Unretained(this)));
 }
 
 void BrowsingDataRemover::OnClearedOriginBoundCerts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   waiting_for_clear_origin_bound_certs_ = false;
   NotifyAndDeleteIfDone();
 }