favor DCHECK_CURRENTLY_ON for better logs in content/browser/[a-d]*

content/browser/devtools/devtools_netlog_observer.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/devtools/devtools_netlog_observer.h"
 
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
@@ skipping 28 matching lines @@
   // The events that the Observer is interested in only occur on the IO thread.
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO))
     return;
 
   if (entry.source().type == net::NetLog::SOURCE_URL_REQUEST)
     OnAddURLRequestEntry(entry);
 }
 
 void DevToolsNetLogObserver::OnAddURLRequestEntry(
     const net::NetLog::Entry& entry) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   bool is_begin = entry.phase() == net::NetLog::PHASE_BEGIN;
   bool is_end = entry.phase() == net::NetLog::PHASE_END;
 
   if (entry.type() == net::NetLog::TYPE_URL_REQUEST_START_JOB) {
     if (is_begin) {
       int load_flags;
       scoped_ptr<base::Value> event_param(entry.ParametersToValue());
       if (!net::StartEventLoadFlagsFromEventParams(event_param.get(),
                                                    &load_flags)) {
@@ skipping 107 matching lines @@
 void DevToolsNetLogObserver::Attach() {
   DCHECK(!instance_);
   net::NetLog* net_log = GetContentClient()->browser()->GetNetLog();
   if (net_log) {
     instance_ = new DevToolsNetLogObserver();
     net_log->AddThreadSafeObserver(instance_, net::NetLog::LOG_ALL_BUT_BYTES);
   }
 }
 
 void DevToolsNetLogObserver::Detach() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (instance_) {
     // Safest not to do this in the destructor to maintain thread safety across
     // refactorings.
     instance_->net_log()->RemoveThreadSafeObserver(instance_);
     delete instance_;
     instance_ = NULL;
   }
 }
 
 DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   return instance_;
 }
 
 // static
 void DevToolsNetLogObserver::PopulateResponseInfo(
     net::URLRequest* request,
     ResourceResponse* response) {
   if (!(request->load_flags() & net::LOAD_REPORT_RAW_HEADERS))
     return;
 
   uint32 source_id = request->net_log().source().id;
   DevToolsNetLogObserver* dev_tools_net_log_observer =
       DevToolsNetLogObserver::GetInstance();
   if (dev_tools_net_log_observer == NULL)
     return;
   response->head.devtools_info =
       dev_tools_net_log_observer->GetResourceInfo(source_id);
 }
 
 }  // namespace content