[Extensions][TaskScheduler] Update ActivityLog for scheduling migration

chrome/browser/extensions/activity_log/activity_database.cc

Index: chrome/browser/extensions/activity_log/activity_database.cc
diff --git a/chrome/browser/extensions/activity_log/activity_database.cc b/chrome/browser/extensions/activity_log/activity_database.cc
index 2b4bc9b26646a640b2363986c4ec504d8b723037..62c4e039d328866d37f1f7ccea2b9a485d65b5fd 100644
--- a/chrome/browser/extensions/activity_log/activity_database.cc
+++ b/chrome/browser/extensions/activity_log/activity_database.cc
@@ -10,11 +10,10 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "base/threading/thread.h"
-#include "base/threading/thread_checker.h"
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "chrome/browser/extensions/activity_log/activity_log_task_runner.h"
 #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h"
 #include "chrome/common/chrome_switches.h"
 #include "sql/error_delegate_util.h"
@@ -26,8 +25,6 @@
 #include "base/mac/mac_util.h"
 #endif
 
-using content::BrowserThread;
-
 namespace extensions {
 
 // A size threshold at which data should be flushed to the database.  The
@@ -56,10 +53,10 @@ ActivityDatabase::ActivityDatabase(ActivityDatabase::Delegate* delegate)
 ActivityDatabase::~ActivityDatabase() {}
 
 void ActivityDatabase::Init(const base::FilePath& db_name) {
-  if (did_init_) return;
+  if (did_init_)
+    return;
   did_init_ = true;
-  if (BrowserThread::IsMessageLoopValid(BrowserThread::DB))
-    DCHECK_CURRENTLY_ON(BrowserThread::DB);
+  DCHECK(GetActivityLogTaskRunner()->RunsTasksInCurrentSequence());
   db_.set_histogram_tag("Activity");
   db_.set_error_callback(
       base::Bind(&ActivityDatabase::DatabaseErrorCallback,
@@ -140,12 +137,10 @@ void ActivityDatabase::SetBatchModeForTesting(bool batch_mode) {
 }
 
 sql::Connection* ActivityDatabase::GetSqlConnection() {
-  if (BrowserThread::IsMessageLoopValid(BrowserThread::DB))
-    DCHECK_CURRENTLY_ON(BrowserThread::DB);
+  DCHECK(GetActivityLogTaskRunner()->RunsTasksInCurrentSequence());
   if (valid_db_) {
     return &db_;
   } else {
-    LOG(WARNING) << "Activity log database is not valid";
     return NULL;
   }
 }
@@ -196,14 +191,6 @@ void ActivityDatabase::RecordBatchedActionsWhileTesting() {
   timer_.Stop();
 }
 
-void ActivityDatabase::SetTimerForTesting(int ms) {
-  timer_.Stop();
-  timer_.Start(FROM_HERE,
-               base::TimeDelta::FromMilliseconds(ms),
-               this,
-               &ActivityDatabase::RecordBatchedActionsWhileTesting);
-}
-
 // static
 bool ActivityDatabase::InitializeTable(sql::Connection* db,
                                        const char* table_name,