Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / browsing_data / browsing_data_local_storage_helper.cc

diff --git a/src/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc b/src/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
index b906a79..f5c0761 100644 (file)
--- a/src/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
+++ b/src/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
 #include "base/bind.h"
-#include "base/message_loop/message_loop.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
@@ -36,9 +35,9 @@ BrowsingDataLocalStorageHelper::~BrowsingDataLocalStorageHelper() {
 
 void BrowsingDataLocalStorageHelper::StartFetching(
     const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!is_fetching_);
-  DCHECK_EQ(false, callback.is_null());
+  DCHECK(!callback.is_null());
 
   is_fetching_ = true;
   completion_callback_ = callback;
@@ -48,13 +47,13 @@ void BrowsingDataLocalStorageHelper::StartFetching(
 }
 
 void BrowsingDataLocalStorageHelper::DeleteOrigin(const GURL& origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   dom_storage_context_->DeleteLocalStorage(origin);
 }
 
 void BrowsingDataLocalStorageHelper::GetUsageInfoCallback(
     const std::vector<content::LocalStorageUsageInfo>& infos) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   for (size_t i = 0; i < infos.size(); ++i) {
     // Non-websafe state is not considered browsing data.
@@ -88,7 +87,7 @@ CannedBrowsingDataLocalStorageHelper::CannedBrowsingDataLocalStorageHelper(
 
 CannedBrowsingDataLocalStorageHelper*
 CannedBrowsingDataLocalStorageHelper::Clone() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CannedBrowsingDataLocalStorageHelper* clone =
       new CannedBrowsingDataLocalStorageHelper(profile_);
 
@@ -121,31 +120,23 @@ CannedBrowsingDataLocalStorageHelper::GetLocalStorageInfo() const {
 
 void CannedBrowsingDataLocalStorageHelper::StartFetching(
     const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback) {
-  DCHECK(!is_fetching_);
-  DCHECK_EQ(false, callback.is_null());
-
-  is_fetching_ = true;
-  completion_callback_ = callback;
-
-  // We post a task to emulate async fetching behavior.
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&CannedBrowsingDataLocalStorageHelper::ConvertPendingInfo,
-                 this));
-}
-
-CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(!callback.is_null());
 
-void CannedBrowsingDataLocalStorageHelper::ConvertPendingInfo() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  local_storage_info_.clear();
+  std::list<LocalStorageInfo> result;
   for (std::set<GURL>::iterator iter = pending_local_storage_info_.begin();
        iter != pending_local_storage_info_.end(); ++iter) {
-    local_storage_info_.push_back(
+    result.push_back(
         LocalStorageInfo(*iter, 0,  base::Time()));
   }
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&CannedBrowsingDataLocalStorageHelper::CallCompletionCallback,
-                 this));
+
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE, base::Bind(callback, result));
 }
+
+void CannedBrowsingDataLocalStorageHelper::DeleteOrigin(const GURL& origin) {
+  pending_local_storage_info_.erase(origin);
+  BrowsingDataLocalStorageHelper::DeleteOrigin(origin);
+}
+
+CannedBrowsingDataLocalStorageHelper::~CannedBrowsingDataLocalStorageHelper() {}