favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/chromeos/

chrome/browser/chromeos/drive/file_system/search_operation.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 "chrome/browser/chromeos/drive/file_system/search_operation.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 80 matching lines @@
       loader_controller_(loader_controller),
       weak_ptr_factory_(this) {
 }
 
 SearchOperation::~SearchOperation() {
 }
 
 void SearchOperation::Search(const std::string& search_query,
                              const GURL& next_link,
                              const SearchCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   if (next_link.is_empty()) {
     // This is first request for the |search_query|.
     scheduler_->Search(
         search_query,
         base::Bind(&SearchOperation::SearchAfterGetFileList,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   } else {
     // There is the remaining result so fetch it.
     scheduler_->GetRemainingFileList(
         next_link,
         base::Bind(&SearchOperation::SearchAfterGetFileList,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 }
 
 void SearchOperation::SearchAfterGetFileList(
     const SearchCallback& callback,
     google_apis::DriveApiErrorCode gdata_error,
     scoped_ptr<google_apis::FileList> file_list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   FileError error = GDataToFileError(gdata_error);
   if (error != FILE_ERROR_OK) {
     callback.Run(error, GURL(), scoped_ptr<std::vector<SearchResultInfo> >());
     return;
   }
 
   DCHECK(file_list);
 
@@ skipping 26 matching lines @@
                  callback,
                  next_url,
                  base::Passed(&result))));
 }
 
 void SearchOperation::SearchAfterResolveSearchResult(
     const SearchCallback& callback,
     const GURL& next_link,
     scoped_ptr<std::vector<SearchResultInfo> > result,
     FileError error) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
   DCHECK(result);
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error, GURL(), scoped_ptr<std::vector<SearchResultInfo> >());
     return;
   }
 
   callback.Run(error, next_link, result.Pass());
 }
 
 }  // namespace file_system
 }  // namespace drive