Browsing Data Deletion: Style fixes

chrome/browser/browsing_data/browsing_data_file_system_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_file_system_helper.h"
 
+#include <set>
+
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_quota_util.h"
@@ skipping 71 matching lines @@
     : filesystem_context_(filesystem_context),
       is_fetching_(false) {
   DCHECK(filesystem_context_.get());
 }
 
 BrowsingDataFileSystemHelperImpl::~BrowsingDataFileSystemHelperImpl() {
 }
 
 void BrowsingDataFileSystemHelperImpl::StartFetching(
     const base::Callback<void(const std::list<FileSystemInfo>&)>& 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;
   file_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(
           &BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread,
           this));
 }
 
 void BrowsingDataFileSystemHelperImpl::DeleteFileSystemOrigin(
     const GURL& origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   file_task_runner()->PostTask(
       FROM_HERE,
       base::Bind(
           &BrowsingDataFileSystemHelperImpl::DeleteFileSystemOriginInFileThread,
           this, origin));
 }
 
 void BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread() {
   DCHECK(file_task_runner()->RunsTasksOnCurrentThread());
 
@@ skipping 33 matching lines @@
        iter != file_system_info_map.end(); ++iter) {
     file_system_info_.push_back(iter->second);
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataFileSystemHelperImpl::NotifyOnUIThread, this));
 }
 
 void BrowsingDataFileSystemHelperImpl::NotifyOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(is_fetching_);
   completion_callback_.Run(file_system_info_);
   completion_callback_.Reset();
   is_fetching_ = false;
 }
 
 void BrowsingDataFileSystemHelperImpl::DeleteFileSystemOriginInFileThread(
     const GURL& origin) {
   DCHECK(file_task_runner()->RunsTasksOnCurrentThread());
   filesystem_context_->DeleteDataForOriginOnFileTaskRunner(origin);
@@ skipping 16 matching lines @@
     Profile* profile) {
 }
 
 CannedBrowsingDataFileSystemHelper::CannedBrowsingDataFileSystemHelper() {
 }
 
 CannedBrowsingDataFileSystemHelper::~CannedBrowsingDataFileSystemHelper() {}
 
 CannedBrowsingDataFileSystemHelper*
     CannedBrowsingDataFileSystemHelper::Clone() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CannedBrowsingDataFileSystemHelper* clone =
       new CannedBrowsingDataFileSystemHelper();
   // This list only mutates on the UI thread, so it's safe to work with it here
   // (given the DCHECK above).
   clone->file_system_info_ = file_system_info_;
   return clone;
 }
 
 void CannedBrowsingDataFileSystemHelper::AddFileSystem(
     const GURL& origin, const fileapi::FileSystemType type, const int64 size) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // This canned implementation of AddFileSystem uses an O(n^2) algorithm; which
   // is fine, as it isn't meant for use in a high-volume context. If it turns
   // out that we want to start using this in a context with many, many origins,
   // we should think about reworking the implementation.
   bool duplicate_origin = false;
   for (std::list<FileSystemInfo>::iterator
            file_system = file_system_info_.begin();
        file_system != file_system_info_.end();
        ++file_system) {
     if (file_system->origin == origin) {
@@ skipping 15 matching lines @@
 
 void CannedBrowsingDataFileSystemHelper::Reset() {
   file_system_info_.clear();
 }
 
 bool CannedBrowsingDataFileSystemHelper::empty() const {
   return file_system_info_.empty();
 }
 
 size_t CannedBrowsingDataFileSystemHelper::GetFileSystemCount() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return file_system_info_.size();
 }
 
 void CannedBrowsingDataFileSystemHelper::StartFetching(
     const base::Callback<void(const std::list<FileSystemInfo>&)>& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(callback, file_system_info_));
 }