[Extensions][TaskScheduler] Update ActivityLog for scheduling migration

chrome/browser/extensions/activity_log/activity_database.h

Index: chrome/browser/extensions/activity_log/activity_database.h
diff --git a/chrome/browser/extensions/activity_log/activity_database.h b/chrome/browser/extensions/activity_log/activity_database.h
index b57ae74c8ed1ab0fe7c20e0970344e3fd90b9678..60366e44e269964f47693b4eadd133327430f63f 100644
--- a/chrome/browser/extensions/activity_log/activity_database.h
+++ b/chrome/browser/extensions/activity_log/activity_database.h
@@ -172,7 +172,6 @@ class ActivityDatabase {
 
   // For unit testing only.
   void RecordBatchedActionsWhileTesting();
-  void SetTimerForTesting(int milliseconds);
 
   // Retrieve a handle to the raw SQL database.  This is only intended to be
   // used by ActivityLogDatabasePolicy::GetDatabaseConnection(), and should
@@ -192,9 +191,7 @@ class ActivityDatabase {
   bool did_init_;
 
   friend class ActivityLogDatabasePolicy;
-  FRIEND_TEST_ALL_PREFIXES(ActivityDatabaseTest, BatchModeOff);
-  FRIEND_TEST_ALL_PREFIXES(ActivityDatabaseTest, BatchModeOn);
-  FRIEND_TEST_ALL_PREFIXES(ActivityDatabaseTest, BatchModeFlush);
+  friend class ActivityDatabaseTest;
   DISALLOW_COPY_AND_ASSIGN(ActivityDatabase);
 };