ContentAPI change - Post DomStorage tasks via a SequencedTaskRunner instead of directly to WEBKIT_DE

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 48 matching lines @@
 }
 
 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;
-  BrowserThread::PostTask(
-      BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
+  dom_storage_context_->task_runner()->PostTask(
+      FROM_HERE,
       base::Bind(
-          &BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread,
+          &BrowsingDataLocalStorageHelper::FetchLocalStorageInfoHelper,
           this));
 }
 
 void BrowsingDataLocalStorageHelper::CancelNotification() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   completion_callback_.Reset();
 }
 
 void BrowsingDataLocalStorageHelper::DeleteLocalStorageFile(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(
-      BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
+  dom_storage_context_->task_runner()->PostTask(
+      FROM_HERE,
       base::Bind(
-          &BrowsingDataLocalStorageHelper::DeleteLocalStorageFileInWebKitThread,
+          &BrowsingDataLocalStorageHelper::DeleteLocalStorageFileHelper,
           this, file_path));
 }
 
-void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoInWebKitThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
+void BrowsingDataLocalStorageHelper::FetchLocalStorageInfoHelper() {
+  DCHECK(dom_storage_context_->task_runner()->RunsTasksOnCurrentThread());
   std::vector<FilePath> files = dom_storage_context_->GetAllStorageFiles();
   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;
     }
@@ skipping 22 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::DeleteLocalStorageFileInWebKitThread(
+void BrowsingDataLocalStorageHelper::DeleteLocalStorageFileHelper(
     const FilePath& file_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
+  DCHECK(dom_storage_context_->task_runner()->RunsTasksOnCurrentThread());
   dom_storage_context_->DeleteLocalStorageFile(file_path);
 }
 
+//---------------------------------------------------------
+
 CannedBrowsingDataLocalStorageHelper::CannedBrowsingDataLocalStorageHelper(
     Profile* profile)
     : BrowsingDataLocalStorageHelper(profile),
       profile_(profile) {
 }
 
 CannedBrowsingDataLocalStorageHelper*
 CannedBrowsingDataLocalStorageHelper::Clone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CannedBrowsingDataLocalStorageHelper* clone =
       new CannedBrowsingDataLocalStorageHelper(profile_);
 
-  base::AutoLock auto_lock(lock_);
   clone->pending_local_storage_info_ = pending_local_storage_info_;
   clone->local_storage_info_ = local_storage_info_;
   return clone;
 }
 
 void CannedBrowsingDataLocalStorageHelper::AddLocalStorage(
     const GURL& origin) {
-  base::AutoLock auto_lock(lock_);
   pending_local_storage_info_.insert(origin);
 }
 
 void CannedBrowsingDataLocalStorageHelper::Reset() {
-  base::AutoLock auto_lock(lock_);
   local_storage_info_.clear();
   pending_local_storage_info_.clear();
 }
 
 bool CannedBrowsingDataLocalStorageHelper::empty() const {
-  base::AutoLock auto_lock(lock_);
   return local_storage_info_.empty() && pending_local_storage_info_.empty();
 }
 
 void CannedBrowsingDataLocalStorageHelper::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;
-  BrowserThread::PostTask(
-      BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
+
+  // We post a task to emulate async fetching behavior.
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::
-          ConvertPendingInfoInWebKitThread, this));
+          ConvertPendingInfo, this));
 }
 
 CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}
 
-void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfoInWebKitThread() {
-  base::AutoLock auto_lock(lock_);
+void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfo() {
   for (std::set<GURL>::iterator info = pending_local_storage_info_.begin();
        info != pending_local_storage_info_.end(); ++info) {
     WebSecurityOrigin web_security_origin =
         WebSecurityOrigin::createFromString(
             UTF8ToUTF16(info->spec()));
     std::string security_origin(web_security_origin.toString().utf8());
 
     bool duplicate = false;
     for (std::list<LocalStorageInfo>::iterator
          local_storage = local_storage_info_.begin();
@@ skipping 17 matching lines @@
         0,
         base::Time()));
   }
   pending_local_storage_info_.clear();
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&CannedBrowsingDataLocalStorageHelper::NotifyInUIThread,
                  this));
 }