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

components/storage_monitor/image_capture_device.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.
 
 #import "components/storage_monitor/image_capture_device.h"
 
 #include "base/files/file_util.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace storage_monitor {
 
 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(content::BrowserThread::FILE);
   bool success = base::ReplaceFile(downloaded_filename, desired_filename, NULL);
   return success ? base::File::FILE_OK : base::File::FILE_ERROR_NOT_FOUND;
 }
 
 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);
 }
 
 base::Time NSDateToBaseTime(NSDate* date) {
   return base::Time::FromDoubleT([date timeIntervalSince1970]);
 }
 
 base::FilePath PathForCameraItem(ICCameraItem* item) {
   std::string name = base::SysNSStringToUTF8([item name]);
@@ skipping 32 matching lines @@
 - (void)dealloc {
   // Make sure the session was closed and listener set to null
   // before destruction.
   DCHECK(![camera_ delegate]);
   DCHECK(!listener_);
   [super dealloc];
 }
 
 - (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];
   [camera_ setDelegate:nil];
   listener_.reset();
 }
 
 - (void)eject {
   [camera_ requestEjectOrDisconnect];
 }
 
 - (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]) {
     std::string itemName = storage_monitor::PathForCameraItem(item).value();
     if (itemName == name) {
       // To create save options for ImageCapture, we need to
       // split the target filename into directory/name
       // and encode the directory as a URL.
       NSString* saveDirectory =
           base::mac::FilePathToNSString(localPath.DirName());
@@ skipping 105 matching lines @@
   // Shared result value from file-copy closure to tell-listener closure.
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&storage_monitor::RenameFile, savedPath, saveAsPath),
       base::Bind(
           &storage_monitor::ReturnRenameResultToListener, listener_, name));
 }
 
 @end  // ImageCaptureDevice