favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/devtools

chrome/browser/devtools/device/usb/android_usb_browsertest.cc

 // Copyright 2014 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 <algorithm>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
@@ skipping 568 matching lines @@
     scoped_refptr<UsbDeviceProvider> provider =
         new UsbDeviceProvider(browser()->profile());
 
     AndroidDeviceManager::DeviceProviders providers;
     providers.push_back(provider);
     adb_bridge_->set_device_providers_for_test(providers);
     runner_ = new content::MessageLoopRunner;
   }
 
   void ScheduleDeviceCountRequest(const base::Closure& request) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     scheduler_invoked_++;
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, request);
   }
 
   virtual void SetUpService() {
     UsbService::SetInstanceForTest(new MockUsbService());
   }
 
   void TearDownOnMainThread() override {
     scoped_refptr<content::MessageLoopRunner> runner =
@@ skipping 83 matching lines @@
     ++invoked_;
     adb_bridge_->RemoveDeviceCountListener(this);
     Shutdown();
   }
 
   void Shutdown() {
     ShutdownOnUIThread();
   };
 
   void ShutdownOnUIThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (reposts_left_-- == 0) {
       base::MessageLoop::current()->Quit();
     } else {
       BrowserThread::PostTask(
           BrowserThread::FILE,
           FROM_HERE,
           base::Bind(&MockCountListener::ShutdownOnFileThread,
                      base::Unretained(this)));
     }
   }
 
   void ShutdownOnFileThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
     BrowserThread::PostTask(BrowserThread::UI,
                             FROM_HERE,
                             base::Bind(&MockCountListener::ShutdownOnUIThread,
                                        base::Unretained(this)));
   }
 
   DevToolsAndroidBridge* adb_bridge_;
   int reposts_left_;
   int invoked_;
 };
@@ skipping 144 matching lines @@
   runner_->Run();
   EXPECT_EQ(2, listener.invoked_);
   EXPECT_EQ(listener.invoked_ - 1, scheduler_invoked_);
 }
 
 IN_PROC_BROWSER_TEST_F(AndroidUsbTraitsTest, TestDeviceCounting) {
   MockCountListenerForCheckingTraits listener(adb_bridge_);
   adb_bridge_->AddDeviceCountListener(&listener);
   runner_->Run();
 }