favor DCHECK_CURRENTLY_ON for better logs in android_webview/

android_webview/browser/aw_form_database_service.cc

 // Copyright (c) 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 "android_webview/browser/aw_form_database_service.h"
 
 #include "base/android/locale_utils.h"
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "components/autofill/core/browser/webdata/autofill_table.h"
@@ skipping 31 matching lines @@
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
       base::Bind(&DatabaseErrorCallback));
   autofill_data_->Init();
 }
 
 AwFormDatabaseService::~AwFormDatabaseService() {
   Shutdown();
 }
 
 void AwFormDatabaseService::Shutdown() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(result_map_.empty());
   // TODO(sgurun) we don't run into this logic right now,
   // but if we do, then we need to implement cancellation
   // of pending queries.
   autofill_data_->ShutdownOnUIThread();
   web_database_->ShutdownDatabase();
 }
 
 scoped_refptr<autofill::AutofillWebDataService>
 AwFormDatabaseService::get_autofill_webdata_service() {
@@ skipping 37 matching lines @@
   PendingQuery query;
   query.result = result;
   query.completion = completion;
   result_map_[pending_query_handle] = query;
 }
 
 void AwFormDatabaseService::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
 
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
   bool has_form_data = false;
   if (result) {
     DCHECK_EQ(AUTOFILL_VALUE_RESULT, result->GetType());
     const WDResult<bool>* autofill_result =
         static_cast<const WDResult<bool>*>(result);
     has_form_data = autofill_result->GetValue();
   }
   QueryMap::const_iterator it = result_map_.find(h);
   if (it == result_map_.end()) {
     LOG(WARNING) << "Received unexpected callback from web data service";
     return;
   }
   *(it->second.result) = has_form_data;
   it->second.completion->Signal();
   result_map_.erase(h);
 }
 
 }  // namespace android_webview