Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions.

chrome/browser/extensions/activity_log/activity_database.cc

 // Copyright (c) 2012 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/extensions/activity_log/activity_database.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 39 matching lines @@
     batching_period_ = base::TimeDelta::FromMinutes(2);
   }
 }
 
 ActivityDatabase::~ActivityDatabase() {}
 
 void ActivityDatabase::Init(const base::FilePath& db_name) {
   if (did_init_) return;
   did_init_ = true;
   if (BrowserThread::IsMessageLoopValid(BrowserThread::DB))
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+    DCHECK_CURRENTLY_ON(BrowserThread::DB);
   db_.set_histogram_tag("Activity");
   db_.set_error_callback(
       base::Bind(&ActivityDatabase::DatabaseErrorCallback,
                  base::Unretained(this)));
   db_.set_page_size(4096);
   db_.set_cache_size(32);
 
   if (!db_.Open(db_name)) {
     LOG(ERROR) << db_.GetErrorMessage();
     return LogInitFailure();
@@ skipping 58 matching lines @@
                  &ActivityDatabase::RecordBatchedActions);
   } else if (!batch_mode && batch_mode_) {
     timer_.Stop();
     RecordBatchedActions();
   }
   batch_mode_ = batch_mode;
 }
 
 sql::Connection* ActivityDatabase::GetSqlConnection() {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::DB))
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+    DCHECK_CURRENTLY_ON(BrowserThread::DB);
   if (valid_db_) {
     return &db_;
   } else {
     LOG(WARNING) << "Activity log database is not valid";
     return NULL;
   }
 }
 
 void ActivityDatabase::Close() {
   timer_.Stop();
@@ skipping 79 matching lines @@
              field_types[i]);
         if (!db->Execute(table_updater.c_str()))
           return false;
       }
     }
   }
   return true;
 }
 
 }  // namespace extensions