[Extensions][TaskScheduler] Update ActivityLog for scheduling migration

chrome/browser/extensions/activity_log/counting_policy_unittest.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/extensions/activity_log/counting_policy.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/simple_test_clock.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
+#include "chrome/browser/extensions/activity_log/activity_log_task_runner.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension_builder.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
-using content::BrowserThread;
-
 namespace extensions {
 
 class CountingPolicyTest : public testing::Test {
  public:
   CountingPolicyTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
 #if defined OS_CHROMEOS
     test_user_manager_.reset(new chromeos::ScopedTestUserManager());
 #endif
     profile_.reset(new TestingProfile());
     base::CommandLine::ForCurrentProcess()->
         AppendSwitch(switches::kEnableExtensionActivityLogging);
     base::CommandLine no_program_command_line(base::CommandLine::NO_PROGRAM);
     extension_service_ = static_cast<TestExtensionSystem*>(
         ExtensionSystem::Get(profile_.get()))->CreateExtensionService
             (&no_program_command_line, base::FilePath(), false);
   }
 
   ~CountingPolicyTest() override {
 #if defined OS_CHROMEOS
     test_user_manager_.reset();
 #endif
     base::RunLoop().RunUntilIdle();
     profile_.reset(NULL);
     base::RunLoop().RunUntilIdle();
   }
 
-  // Wait for the task queue for the specified thread to empty.
-  void WaitOnThread(const BrowserThread::ID& thread) {
-    BrowserThread::PostTaskAndReply(
-        thread, FROM_HERE, base::BindOnce(&base::DoNothing),
+  // Waits for the task queue for the activity log sequence to empty.
+  void WaitOnActivityLogSequence() {
+    GetActivityLogTaskRunner()->PostTaskAndReply(
+        FROM_HERE, base::BindOnce(&base::DoNothing),
         base::MessageLoop::current()->QuitWhenIdleClosure());

[gab, 2017/07/27 18:34:53]

While you're here, this is a deprecated paradigm, should instantiate the RunLoop
above this and pass run_loop.QuitWhenIdleClosure() in here instead.

[Devlin, 2017/07/28 14:41:12]

Sure, done.

     base::RunLoop().Run();
   }
 
   // A wrapper function for CheckReadFilteredData, so that we don't need to
   // enter empty string values for parameters we don't care about.
   void CheckReadData(ActivityLogDatabasePolicy* policy,
                      const std::string& extension_id,
                      int day,
                      const base::Callback<void(
                          std::unique_ptr<Action::ActionVector>)>& checker) {
@@ skipping 676 matching lines @@
       "punky", mock_clock->Now(), Action::ACTION_API_CALL, "tabs.create");
   policy->ProcessAction(action);
 
   // There should now be three strings ("punky", "brewster", "tabs.create") and
   // one URL in the tables.
   policy->Flush();
   policy->ScheduleAndForget(policy,
                             &CountingPolicyTest::CheckStringTableSizes,
                             3,
                             1);
-  WaitOnThread(BrowserThread::DB);
+  WaitOnActivityLogSequence();
 
   // Trigger a cleaning.  The oldest action is expired when we submit a
   // duplicate of the newer action.  After this, there should be two strings
   // and no URLs.
   policy->set_retention_time(base::TimeDelta::FromDays(2));
   policy->last_database_cleaning_time_ = base::Time();
   policy->ProcessAction(action);
   policy->Flush();
   policy->ScheduleAndForget(policy,
                             &CountingPolicyTest::CheckStringTableSizes,
                             2,
                             0);
-  WaitOnThread(BrowserThread::DB);
+  WaitOnActivityLogSequence();
 
   policy->Close();
 }
 
 // A stress test for memory- and database-based merging of actions.  Submit
 // multiple items, not in chronological order, spanning a few days.  Check that
 // items are merged properly and final timestamps are correct.
 TEST_F(CountingPolicyTest, MoreMerging) {
   CountingPolicy* policy = new CountingPolicy(profile_.get());
   policy->Init();
@@ skipping 77 matching lines @@
   for (int i = 0; i < 500; i++) {
     scoped_refptr<Action> action =
         new Action("punky",
                    base::Time::Now(),
                    Action::ACTION_API_CALL,
                    base::StringPrintf("apicall_%d", i));
     policy->ProcessAction(action);
   }
 
   policy->ScheduleAndForget(policy, &CountingPolicyTest::CheckQueueSize);
-  WaitOnThread(BrowserThread::DB);
+  WaitOnActivityLogSequence();
 
   policy->Close();
 }
 
 TEST_F(CountingPolicyTest, CapReturns) {
   CountingPolicy* policy = new CountingPolicy(profile_.get());
   policy->Init();
 
   for (int i = 0; i < 305; i++) {
     scoped_refptr<Action> action =
         new Action("punky",
                    base::Time::Now(),
                    Action::ACTION_API_CALL,
                    base::StringPrintf("apicall_%d", i));
     policy->ProcessAction(action);
   }
 
   policy->Flush();
-  WaitOnThread(BrowserThread::DB);
+  WaitOnActivityLogSequence();
 
   CheckReadFilteredData(
       policy,
       "punky",
       Action::ACTION_ANY,
       "",
       "",
       "",
       -1,
       base::Bind(
@@ skipping 364 matching lines @@
 
   action_ids.push_back(2);
   CheckRemoveActions(
       policy, action_ids, base::Bind(&CountingPolicyTest::Action2Deleted));
   action_ids.clear();
 
   policy->Close();
 }
 
 }  // namespace extensions