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

components/storage_monitor/storage_monitor_chromeos.cc

 // 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_chromeos.h"
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
@@ skipping 61 matching lines @@
                       device_label,
                       base::UTF8ToUTF16(disk->vendor_name()),
                       base::UTF8ToUTF16(disk->product_name()),
                       disk->total_size_in_bytes());
   return true;
 }
 
 // Returns whether the mount point in |mount_info| is a media device or not.
 bool CheckMountedPathOnFileThread(
     const DiskMountManager::MountPointInfo& mount_info) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   return MediaStorageUtil::HasDcim(base::FilePath(mount_info.mount_path));
 }
 
 }  // namespace
 
 using content::BrowserThread;
 
 StorageMonitorCros::StorageMonitorCros()
     : weak_ptr_factory_(this) {
 }
@@ skipping 15 matching lines @@
     media_transfer_protocol_manager_.reset(
         device::MediaTransferProtocolManager::Initialize(loop_proxy));
   }
 
   media_transfer_protocol_device_observer_.reset(
       new MediaTransferProtocolDeviceObserverLinux(
           receiver(), media_transfer_protocol_manager_.get()));
 }
 
 void StorageMonitorCros::CheckExistingMountPoints() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   const DiskMountManager::MountPointMap& mount_point_map =
       DiskMountManager::GetInstance()->mount_points();
   for (DiskMountManager::MountPointMap::const_iterator it =
       mount_point_map.begin(); it != mount_point_map.end(); ++it) {
     BrowserThread::PostTaskAndReplyWithResult(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&CheckMountedPathOnFileThread, it->second),
         base::Bind(&StorageMonitorCros::AddMountedPath,
                    weak_ptr_factory_.GetWeakPtr(), it->second));
   }
@@ skipping 12 matching lines @@
 void StorageMonitorCros::OnDiskEvent(DiskMountManager::DiskEvent event,
                                      const DiskMountManager::Disk* disk) {}
 
 void StorageMonitorCros::OnDeviceEvent(DiskMountManager::DeviceEvent event,
                                        const std::string& device_path) {}
 
 void StorageMonitorCros::OnMountEvent(
     DiskMountManager::MountEvent event,
     chromeos::MountError error_code,
     const DiskMountManager::MountPointInfo& mount_info) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Ignore mount points that are not devices.
   if (mount_info.mount_type != chromeos::MOUNT_TYPE_DEVICE)
     return;
   // Ignore errors.
   if (error_code != chromeos::MOUNT_ERROR_NONE)
     return;
   if (mount_info.mount_condition != chromeos::disks::MOUNT_CONDITION_NONE)
     return;
 
@@ skipping 108 matching lines @@
 }
 
 device::MediaTransferProtocolManager*
 StorageMonitorCros::media_transfer_protocol_manager() {
   return media_transfer_protocol_manager_.get();
 }
 
 void StorageMonitorCros::AddMountedPath(
     const DiskMountManager::MountPointInfo& mount_info,
     bool has_dcim) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (ContainsKey(mount_map_, mount_info.mount_path)) {
     // CheckExistingMountPointsOnUIThread() added the mount point information
     // in the map before the device attached handler is called. Therefore, an
     // entry for the device already exists in the map.
     return;
   }
 
   // Get the media device uuid and label if exists.
   StorageInfo info;
   if (!GetDeviceInfo(mount_info, has_dcim, &info))
     return;
 
   if (info.device_id().empty())
     return;
 
   mount_map_.insert(std::make_pair(mount_info.mount_path, info));
 
   receiver()->ProcessAttach(info);
 }
 
 StorageMonitor* StorageMonitor::CreateInternal() {
   return new StorageMonitorCros();
 }
 
 }  // namespace storage_monitor