Browsing Data Deletion: Style fixes

chrome/browser/browsing_data/browsing_data_local_storage_helper.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/browsing_data_local_storage_helper.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 17 matching lines @@
               GetDOMStorageContext()),
       is_fetching_(false) {
   DCHECK(dom_storage_context_);
 }
 
 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;
   dom_storage_context_->GetLocalStorageUsage(
       base::Bind(
           &BrowsingDataLocalStorageHelper::GetUsageInfoCallback, this));
 }
 
 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.
     const content::LocalStorageUsageInfo& info = infos[i];
     if (BrowsingDataHelper::HasWebScheme(info.origin)) {
       local_storage_info_.push_back(
           LocalStorageInfo(info.origin, info.data_size, info.last_modified));
     }
   }
 
@@ skipping 13 matching lines @@
 //---------------------------------------------------------
 
 CannedBrowsingDataLocalStorageHelper::CannedBrowsingDataLocalStorageHelper(
     Profile* profile)
     : BrowsingDataLocalStorageHelper(profile),
       profile_(profile) {
 }
 
 CannedBrowsingDataLocalStorageHelper*
 CannedBrowsingDataLocalStorageHelper::Clone() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CannedBrowsingDataLocalStorageHelper* clone =
       new CannedBrowsingDataLocalStorageHelper(profile_);
 
   clone->pending_local_storage_info_ = pending_local_storage_info_;
   return clone;
 }
 
 void CannedBrowsingDataLocalStorageHelper::AddLocalStorage(
     const GURL& origin) {
   if (BrowsingDataHelper::HasWebScheme(origin))
@@ skipping 12 matching lines @@
   return pending_local_storage_info_.size();
 }
 
 const std::set<GURL>&
 CannedBrowsingDataLocalStorageHelper::GetLocalStorageInfo() const {
   return pending_local_storage_info_;
 }
 
 void CannedBrowsingDataLocalStorageHelper::StartFetching(
     const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   std::list<LocalStorageInfo> result;
   for (std::set<GURL>::iterator iter = pending_local_storage_info_.begin();
        iter != pending_local_storage_info_.end(); ++iter) {
     result.push_back(
         LocalStorageInfo(*iter, 0,  base::Time()));
   }
 
   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() {}