[chrome/browser/local_discovery] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc

Index: chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
diff --git a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
index 88620d34677505752128a8ee308c859aaf7da983..6e59fc83fe91935a49ecdab9d847de8465dbb1b9 100644
--- a/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
+++ b/chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc
@@ -143,7 +143,7 @@ WifiManagerNonChromeos::WifiServiceWrapper::~WifiServiceWrapper() {
 }
 
 void WifiManagerNonChromeos::WifiServiceWrapper::Start() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   wifi_service_.reset(WiFiService::Create());
 
   wifi_service_->Initialize(base::MessageLoopProxy::current());
@@ -158,7 +158,7 @@ void WifiManagerNonChromeos::WifiServiceWrapper::Start() {
 
 void WifiManagerNonChromeos::WifiServiceWrapper::GetSSIDList(
     const WifiManager::SSIDListCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   scoped_ptr<NetworkPropertiesList> ssid_list(new NetworkPropertiesList);
   GetSSIDListInternal(ssid_list.get());
@@ -175,7 +175,7 @@ void WifiManagerNonChromeos::WifiServiceWrapper::ConfigureAndConnectPskNetwork(
     const std::string& ssid,
     const std::string& password,
     const WifiManager::SuccessCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   scoped_ptr<base::DictionaryValue> properties = MakeProperties(ssid, password);
 
   std::string network_guid;
@@ -201,7 +201,7 @@ void WifiManagerNonChromeos::WifiServiceWrapper::ConfigureAndConnectPskNetwork(
 
 void WifiManagerNonChromeos::WifiServiceWrapper::OnNetworkListChangedEvent(
     const std::vector<std::string>& network_guids) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   scoped_ptr<NetworkPropertiesList> ssid_list(new NetworkPropertiesList);
   GetSSIDListInternal(ssid_list.get());
   callback_runner_->PostTask(
@@ -213,7 +213,7 @@ void WifiManagerNonChromeos::WifiServiceWrapper::OnNetworkListChangedEvent(
 
 void WifiManagerNonChromeos::WifiServiceWrapper::OnNetworksChangedEvent(
     const std::vector<std::string>& network_guids) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   if (connecting_network_guid_.empty() ||
       !IsConnected(connecting_network_guid_)) {
     return;
@@ -234,14 +234,14 @@ WifiManagerNonChromeos::WifiServiceWrapper::AsWeakPtr() {
 }
 
 void WifiManagerNonChromeos::WifiServiceWrapper::RequestScan() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   wifi_service_->RequestNetworkScan();
 }
 
 void WifiManagerNonChromeos::WifiServiceWrapper::ConnectToNetworkByID(
     const std::string& network_guid,
     const WifiManager::SuccessCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   std::string connected_network_id = GetConnectedGUID();
   std::string error_string;
@@ -295,7 +295,7 @@ void WifiManagerNonChromeos::WifiServiceWrapper::OnConnectToNetworkTimeout() {
 void WifiManagerNonChromeos::WifiServiceWrapper::RequestNetworkCredentials(
     const std::string& ssid,
     const WifiManager::CredentialsCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 
   bool success = true;
   std::string guid;
@@ -471,7 +471,7 @@ WifiManagerNonChromeos::~WifiManagerNonChromeos() {
 }
 
 void WifiManagerNonChromeos::Start() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   task_runner_ = content::BrowserThread::GetMessageLoopProxyForThread(
       content::BrowserThread::FILE);
 
@@ -486,7 +486,7 @@ void WifiManagerNonChromeos::Start() {
 }
 
 void WifiManagerNonChromeos::GetSSIDList(const SSIDListCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(&WifiServiceWrapper::GetSSIDList,
                                     wifi_wrapper_->AsWeakPtr(),
@@ -494,7 +494,7 @@ void WifiManagerNonChromeos::GetSSIDList(const SSIDListCallback& callback) {
 }
 
 void WifiManagerNonChromeos::RequestScan() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&WifiServiceWrapper::RequestScan, wifi_wrapper_->AsWeakPtr()));
@@ -502,14 +502,14 @@ void WifiManagerNonChromeos::RequestScan() {
 
 void WifiManagerNonChromeos::OnNetworkListChanged(
     scoped_ptr<NetworkPropertiesList> ssid_list) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   FOR_EACH_OBSERVER(NetworkListObserver,
                     network_list_observers_,
                     OnNetworkListChanged(*ssid_list));
 }
 
 void WifiManagerNonChromeos::PostClosure(const base::Closure& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   callback.Run();
 }
 
@@ -523,7 +523,7 @@ void WifiManagerNonChromeos::ConfigureAndConnectNetwork(
     const std::string& ssid,
     const WifiCredentials& credentials,
     const SuccessCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&WifiServiceWrapper::ConfigureAndConnectPskNetwork,
@@ -536,7 +536,7 @@ void WifiManagerNonChromeos::ConfigureAndConnectNetwork(
 void WifiManagerNonChromeos::ConnectToNetworkByID(
     const std::string& internal_id,
     const SuccessCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   task_runner_->PostTask(FROM_HERE,
                          base::Bind(&WifiServiceWrapper::ConnectToNetworkByID,
                                     wifi_wrapper_->AsWeakPtr(),
@@ -547,7 +547,7 @@ void WifiManagerNonChromeos::ConnectToNetworkByID(
 void WifiManagerNonChromeos::RequestNetworkCredentials(
     const std::string& ssid,
     const CredentialsCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&WifiServiceWrapper::RequestNetworkCredentials,