favor DCHECK_CURRENTLY_ON for better logs in content/browser/[f-p]*

content/browser/plugin_loader_posix.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 "content/browser/plugin_loader_posix.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "content/browser/utility_process_host_impl.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/plugin_list.h"
 #include "content/common/utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/user_metrics.h"
 
 namespace content {
 
 PluginLoaderPosix::PluginLoaderPosix()
     : next_load_index_(0), loading_plugins_(false) {
 }
 
 void PluginLoaderPosix::GetPlugins(
     const PluginService::GetPluginsCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   std::vector<WebPluginInfo> cached_plugins;
   if (PluginList::Singleton()->GetPluginsNoRefresh(&cached_plugins)) {
     // Can't assume the caller is reentrant.
     base::MessageLoop::current()->PostTask(FROM_HERE,
         base::Bind(callback, cached_plugins));
     return;
   }
 
   if (!loading_plugins_) {
@@ skipping 53 matching lines @@
 bool PluginLoaderPosix::Send(IPC::Message* message) {
   if (process_host_.get())
     return process_host_->Send(message);
   return false;
 }
 
 PluginLoaderPosix::~PluginLoaderPosix() {
 }
 
 void PluginLoaderPosix::GetPluginsToLoad() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   base::TimeTicks start_time(base::TimeTicks::Now());
 
   loaded_plugins_.clear();
   next_load_index_ = 0;
 
   canonical_list_.clear();
   PluginList::Singleton()->GetPluginPathsToLoad(
       &canonical_list_,
       PluginService::GetInstance()->NPAPIPluginsSupported());
 
   internal_plugins_.clear();
   PluginList::Singleton()->GetInternalPlugins(&internal_plugins_);
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&PluginLoaderPosix::LoadPluginsInternal,
                  make_scoped_refptr(this)));
 
   LOCAL_HISTOGRAM_TIMES("PluginLoaderPosix.GetPluginList",
                         (base::TimeTicks::Now() - start_time) *
                             base::Time::kMicrosecondsPerMillisecond);
 }
 
 void PluginLoaderPosix::LoadPluginsInternal() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Check if the list is empty or all plugins have already been loaded before
   // forking.
   if (IsFinishedLoadingPlugins()) {
     FinishedLoadingPlugins();
     return;
   }
 
   RecordAction(
       base::UserMetricsAction("PluginLoaderPosix.LaunchUtilityProcess"));
@@ skipping 93 matching lines @@
         FROM_HERE, base::Bind(callback, loaded_plugins_));
   }
   callbacks_.clear();
 }
 
 bool PluginLoaderPosix::LaunchUtilityProcess() {
   return process_host_->Send(new UtilityMsg_LoadPlugins(canonical_list_));
 }
 
 }  // namespace content