favor DCHECK_CURRENTLY_ON for better logs in components/ (part 2)

components/storage_monitor/storage_monitor_mac.mm

 // Copyright 2014 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 "components/storage_monitor/storage_monitor_mac.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 StorageInfo::Type GetDeviceType(bool is_removable, bool has_dcim) {
   if (!is_removable)
     return StorageInfo::FIXED_MASS_STORAGE;
   if (has_dcim)
     return StorageInfo::REMOVABLE_MASS_STORAGE_WITH_DCIM;
   return StorageInfo::REMOVABLE_MASS_STORAGE_NO_DCIM;
 }
 
 StorageInfo BuildStorageInfo(
     CFDictionaryRef dict, std::string* bsd_name) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   CFStringRef device_bsd_name = base::mac::GetValueFromDictionary<CFStringRef>(
       dict, kDADiskDescriptionMediaBSDNameKey);
   if (device_bsd_name && bsd_name)
     *bsd_name = base::SysCFStringRefToUTF8(device_bsd_name);
 
   CFURLRef url = base::mac::GetValueFromDictionary<CFURLRef>(
       dict, kDADiskDescriptionVolumePathKey);
   NSURL* nsurl = base::mac::CFToNSCast(url);
   base::FilePath location = base::mac::NSStringToFilePath([nsurl path]);
@@ skipping 41 matching lines @@
     device_id = StorageInfo::MakeDeviceId(device_type, unique_id);
 
   return StorageInfo(device_id, location.value(), label, vendor, model,
                      size_in_bytes);
 }
 
 void GetDiskInfoAndUpdateOnFileThread(
     const base::WeakPtr<StorageMonitorMac>& monitor,
     base::ScopedCFTypeRef<CFDictionaryRef> dict,
     StorageMonitorMac::UpdateType update_type) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   std::string bsd_name;
   StorageInfo info = BuildStorageInfo(dict, &bsd_name);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI,
       FROM_HERE,
       base::Bind(&StorageMonitorMac::UpdateDisk,
                  monitor,
                  bsd_name,
@@ skipping 79 matching lines @@
   if (base::mac::IsOSLionOrLater()) {
     image_capture_device_manager_.reset(new ImageCaptureDeviceManager);
     image_capture_device_manager_->SetNotifications(receiver());
   }
 }
 
 void StorageMonitorMac::UpdateDisk(
     const std::string& bsd_name,
     const StorageInfo& info,
     UpdateType update_type) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   pending_disk_updates_--;
   bool initialization_complete = false;
   if (!IsInitialized() && pending_disk_updates_ == 0)
     initialization_complete = true;
 
   if (info.device_id().empty() || bsd_name.empty()) {
     if (initialization_complete)
       MarkInitialized();
     return;
@@ skipping 118 matching lines @@
 void StorageMonitorMac::DiskDescriptionChangedCallback(DADiskRef disk,
                                                        CFArrayRef keys,
                                                        void *context) {
   StorageMonitorMac* monitor = static_cast<StorageMonitorMac*>(context);
   monitor->GetDiskInfoAndUpdate(disk, UPDATE_DEVICE_CHANGED);
 }
 
 void StorageMonitorMac::GetDiskInfoAndUpdate(
     DADiskRef disk,
     StorageMonitorMac::UpdateType update_type) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   pending_disk_updates_++;
 
   base::ScopedCFTypeRef<CFDictionaryRef> dict(DADiskCopyDescription(disk));
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(GetDiskInfoAndUpdateOnFileThread,
                  AsWeakPtr(), dict, update_type));
 }
@@ skipping 20 matching lines @@
     }
   }
   return false;
 }
 
 StorageMonitor* StorageMonitor::CreateInternal() {
   return new StorageMonitorMac();
 }
 
 }  // namespace storage_monitor