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

chrome/browser/browsing_data_local_storage_helper.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/browsing_data_local_storage_helper.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 34 matching lines @@
       size(size),
       last_modified(last_modified) {
       }
 
 BrowsingDataLocalStorageHelper::LocalStorageInfo::~LocalStorageInfo() {}
 
 BrowsingDataLocalStorageHelper::BrowsingDataLocalStorageHelper(
     Profile* profile)
     : dom_storage_context_(BrowserContext::GetDOMStorageContext(profile)),
       is_fetching_(false) {
-  DCHECK(dom_storage_context_.get());
+  DCHECK(dom_storage_context_);
 }
 
 BrowsingDataLocalStorageHelper::~BrowsingDataLocalStorageHelper() {
 }
 
 void BrowsingDataLocalStorageHelper::StartFetching(
     const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!is_fetching_);
   DCHECK_EQ(false, callback.is_null());
 
   is_fetching_ = true;
   completion_callback_ = callback;
-  dom_storage_context_->task_runner()->PostTask(
-      FROM_HERE,
+  dom_storage_context_->GetAllStorageFiles(
       base::Bind(
-          &BrowsingDataLocalStorageHelper::FetchLocalStorageInfoHelper,
-          this));
+          &BrowsingDataLocalStorageHelper::GetAllStorageFilesCallback, this));
 }
 
 void BrowsingDataLocalStorageHelper::CancelNotification() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   completion_callback_.Reset();
 }
 
 void BrowsingDataLocalStorageHelper::DeleteLocalStorageFile(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  dom_storage_context_->task_runner()->PostTask(
+  dom_storage_context_->DeleteLocalStorageFile(file_path);
+}
+
+void BrowsingDataLocalStorageHelper::GetAllStorageFilesCallback(
+    const std::vector<FilePath>& files) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  BrowserThread::PostTask(
+      BrowserThread::FILE,
       FROM_HERE,
       base::Bind(
-          &BrowsingDataLocalStorageHelper::DeleteLocalStorageFileHelper,
-          this, file_path));
+          &BrowsingDataLocalStorageHelper::FetchLocalStorageInfo,
+          this, files));
 }
 
-void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoHelper() {
-  DCHECK(dom_storage_context_->task_runner()->RunsTasksOnCurrentThread());
-  std::vector<FilePath> files = dom_storage_context_->GetAllStorageFiles();
+void BrowsingDataLocalStorageHelper::FetchLocalStorageInfo(
+    const std::vector<FilePath>& files) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   for (size_t i = 0; i < files.size(); ++i) {
     FilePath file_path = files[i];
     WebSecurityOrigin web_security_origin =
         WebSecurityOrigin::createFromDatabaseIdentifier(
             webkit_glue::FilePathToWebString(file_path.BaseName()));
     if (EqualsASCII(web_security_origin.protocol(), chrome::kExtensionScheme)) {
       // Extension state is not considered browsing data.
       continue;
     }
     base::PlatformFileInfo file_info;
@@ skipping 21 matching lines @@
   DCHECK(is_fetching_);
   // Note: completion_callback_ mutates only in the UI thread, so it's safe to
   // test it here.
   if (!completion_callback_.is_null()) {
     completion_callback_.Run(local_storage_info_);
     completion_callback_.Reset();
   }
   is_fetching_ = false;
 }
 
-void BrowsingDataLocalStorageHelper::DeleteLocalStorageFileHelper(
-    const FilePath& file_path) {
-  DCHECK(dom_storage_context_->task_runner()->RunsTasksOnCurrentThread());
-  dom_storage_context_->DeleteLocalStorageFile(file_path);
-}
-
 //---------------------------------------------------------
 
 CannedBrowsingDataLocalStorageHelper::CannedBrowsingDataLocalStorageHelper(
     Profile* profile)
     : BrowsingDataLocalStorageHelper(profile),
       profile_(profile) {
 }
 
 CannedBrowsingDataLocalStorageHelper*
 CannedBrowsingDataLocalStorageHelper::Clone() {
@@ skipping 69 matching lines @@
         0,
         base::Time()));
   }
   pending_local_storage_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::NotifyInUIThread,
                  this));
 }