Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in content/browser/renderer_hos…

content/browser/renderer_host/pepper/pepper_network_monitor_host.cc

 // Copyright 2013 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/renderer_host/pepper/pepper_network_monitor_host.h"
 
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
 #include "content/browser/renderer_host/pepper/pepper_socket_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/socket_permission_request.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
 
 namespace content {
 
 namespace {
 
 bool CanUseNetworkMonitor(bool external_plugin,
                           int render_process_id,
                           int render_frame_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   SocketPermissionRequest request = SocketPermissionRequest(
       SocketPermissionRequest::NETWORK_STATE, std::string(), 0);
   return pepper_socket_utils::CanUseSocketAPIs(
       external_plugin, false /* private_api */, &request, render_process_id,
       render_frame_id);
 }
 
 scoped_ptr<net::NetworkInterfaceList> GetNetworkList() {
   scoped_ptr<net::NetworkInterfaceList> list(new net::NetworkInterfaceList());
@@ skipping 37 matching lines @@
     host()->SendUnsolicitedReply(pp_resource(),
                                  PpapiPluginMsg_NetworkMonitor_Forbidden());
     return;
   }
 
   net::NetworkChangeNotifier::AddIPAddressObserver(this);
   GetAndSendNetworkList();
 }
 
 void PepperNetworkMonitorHost::GetAndSendNetworkList() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // Call GetNetworkList() on a thread that allows blocking IO.
   base::PostTaskAndReplyWithResult(
       BrowserThread::GetBlockingPool(), FROM_HERE,
       base::Bind(&GetNetworkList),
       base::Bind(&PepperNetworkMonitorHost::SendNetworkList,
                  weak_factory_.GetWeakPtr()));
 }
 
 void PepperNetworkMonitorHost::SendNetworkList(
     scoped_ptr<net::NetworkInterfaceList> list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   scoped_ptr<ppapi::proxy::SerializedNetworkList> list_copy(
       new ppapi::proxy::SerializedNetworkList(list->size()));
   for (size_t i = 0; i < list->size(); ++i) {
     const net::NetworkInterface& network = list->at(i);
     ppapi::proxy::SerializedNetworkInfo& network_copy = list_copy->at(i);
     network_copy.name = network.name;
 
     network_copy.addresses.resize(
         1, ppapi::NetAddressPrivateImpl::kInvalidNetAddress);
     bool result = ppapi::NetAddressPrivateImpl::IPEndPointToNetAddress(
         network.address, 0, &(network_copy.addresses[0]));
     DCHECK(result);
 
     // TODO(sergeyu): Currently net::NetworkInterfaceList provides
     // only name and one IP address. Add all other fields and copy
     // them here.
     network_copy.type = PP_NETWORKLIST_TYPE_UNKNOWN;
     network_copy.state = PP_NETWORKLIST_STATE_UP;
     network_copy.display_name = network.name;
     network_copy.mtu = 0;
   }
   host()->SendUnsolicitedReply(
       pp_resource(), PpapiPluginMsg_NetworkMonitor_NetworkList(*list_copy));
 }
 
 }  // namespace content