favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/media_galleries , metrics and nacl_host

chrome/browser/media_galleries/fileapi/native_media_file_util.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/media_galleries/fileapi/native_media_file_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 36 matching lines @@
 }
 
 void HoldFileRef(
     const scoped_refptr<storage::ShareableFileReference>& file_ref) {
 }
 
 void DidOpenSnapshot(
     const storage::AsyncFileUtil::CreateOrOpenCallback& callback,
     const scoped_refptr<storage::ShareableFileReference>& file_ref,
     base::File file) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (!file.IsValid()) {
     callback.Run(file.Pass(), base::Closure());
     return;
   }
   callback.Run(file.Pass(), base::Bind(&HoldFileRef, file_ref));
 }
 
 }  // namespace
 
 NativeMediaFileUtil::NativeMediaFileUtil(MediaPathFilter* media_path_filter)
@@ skipping 29 matching lines @@
 
 // static
 void NativeMediaFileUtil::CreatedSnapshotFileForCreateOrOpen(
     base::SequencedTaskRunner* media_task_runner,
     int file_flags,
     const storage::AsyncFileUtil::CreateOrOpenCallback& callback,
     base::File::Error result,
     const base::File::Info& file_info,
     const base::FilePath& platform_path,
     const scoped_refptr<storage::ShareableFileReference>& file_ref) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (result != base::File::FILE_OK) {
     callback.Run(base::File(), base::Closure());
     return;
   }
   base::PostTaskAndReplyWithResult(
       media_task_runner,
       FROM_HERE,
       base::Bind(
           &storage::NativeFileUtil::CreateOrOpen, platform_path, file_flags),
       base::Bind(&DidOpenSnapshot, callback, file_ref));
@@ skipping 553 matching lines @@
     return base::File::FILE_ERROR_FAILED;
 
   if (!file_info.is_directory &&
       !media_path_filter_->Match(file_path)) {
     return failure_error;
   }
 
   *local_file_path = file_path;
   return base::File::FILE_OK;
 }