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

components/storage_monitor/image_capture_device.mm

Index: components/storage_monitor/image_capture_device.mm
diff --git a/components/storage_monitor/image_capture_device.mm b/components/storage_monitor/image_capture_device.mm
index 1008bfd435cb908a2efbbf56bcb5207146f82fcb..e7270f26af4360f0ec800f6f68c213206fdc0492 100644
--- a/components/storage_monitor/image_capture_device.mm
+++ b/components/storage_monitor/image_capture_device.mm
@@ -13,7 +13,7 @@ namespace {
 
 base::File::Error RenameFile(const base::FilePath& downloaded_filename,
                              const base::FilePath& desired_filename) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);

[Cait (Slow), 2015/04/23 00:02:37]

content::BrowserThread::FILE?

[Mostyn Bramley-Moore, 2015/04/23 07:43:16]

Done.

   bool success = base::ReplaceFile(downloaded_filename, desired_filename, NULL);
   return success ? base::File::FILE_OK : base::File::FILE_ERROR_NOT_FOUND;
 }
@@ -22,7 +22,7 @@ void ReturnRenameResultToListener(
     base::WeakPtr<ImageCaptureDeviceListener> listener,
     const std::string& name,
     const base::File::Error& result) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (listener)
     listener->DownloadedFile(name, result);
 }
@@ -75,18 +75,18 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
 
 - (void)setListener:(base::WeakPtr<storage_monitor::ImageCaptureDeviceListener>)
         listener {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   listener_ = listener;
 }
 
 - (void)open {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(listener_);
   [camera_ requestOpenSession];
 }
 
 - (void)close {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   closing_ = true;
   [camera_ cancelDownload];
   [camera_ requestCloseSession];
@@ -100,7 +100,7 @@ base::FilePath PathForCameraItem(ICCameraItem* item) {
 
 - (void)downloadFile:(const std::string&)name
            localPath:(const base::FilePath&)localPath {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // Find the file with that name and start download.
   for (ICCameraItem* item in [camera_ mediaFiles]) {