Extension activity log database refactoring (step 1)

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 <string>
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread.h"
@@ skipping 16 matching lines @@
 
 bool SortActionsByTime(const scoped_refptr<extensions::Action> a,
                        const scoped_refptr<extensions::Action> b) {
   return a->time() > b->time();
 }
 
 }  // namespace
 
 namespace extensions {
 
-ActivityDatabase::ActivityDatabase()
-    : testing_clock_(NULL),
+ActivityDatabase::ActivityDatabase(
+    ActivityDatabaseCallbacks* callbacks)
+    : policy_callbacks_(callbacks),
+      testing_clock_(NULL),
       valid_db_(false),
       already_closed_(false),
       did_init_(false) {
   // We don't batch commits when in testing mode.
   batch_mode_ = !(CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableExtensionActivityLogTesting));
 }
 
 ActivityDatabase::~ActivityDatabase() {}
 
@@ skipping 20 matching lines @@
   if (!committer.Begin())
     return LogInitFailure();
 
 #if defined(OS_MACOSX)
   // Exclude the database from backups.
   base::mac::SetFileBackupExclusion(db_name);
 #endif
 
   db_.Preload();
 
-  // Create the DOMAction database.
-  if (!DOMAction::InitializeTable(&db_))
-    return LogInitFailure();
-
-  // Create the APIAction database.
-  if (!APIAction::InitializeTable(&db_))
-    return LogInitFailure();
-
-  // Create the BlockedAction database.
-  if (!BlockedAction::InitializeTable(&db_))
+  if (!policy_callbacks_->DatabaseInitCallback(&db_))
     return LogInitFailure();
 
   sql::InitStatus stat = committer.Commit() ? sql::INIT_OK : sql::INIT_FAILURE;
   if (stat != sql::INIT_OK)
     return LogInitFailure();
 
   valid_db_ = true;
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromMinutes(2),
                this,
@@ skipping 115 matching lines @@
 }
 
 void ActivityDatabase::Close() {
   timer_.Stop();
   if (!already_closed_) {
     RecordBatchedActions();
     db_.reset_error_callback();
   }
   valid_db_ = false;
   already_closed_ = true;
+  // Call DatabaseCloseCallback() just before deleting the ActivityDatabase
+  // itself--these two objects should have the same lifetime.
+  policy_callbacks_->DatabaseCloseCallback();
   delete this;
 }
 
 void ActivityDatabase::HardFailureClose() {
   if (already_closed_) return;
   valid_db_ = false;
   timer_.Stop();
   db_.reset_error_callback();
   db_.RazeAndClose();
   already_closed_ = true;
@@ skipping 26 matching lines @@
 
 void ActivityDatabase::SetTimerForTesting(int ms) {
   timer_.Stop();
   timer_.Start(FROM_HERE,
                base::TimeDelta::FromMilliseconds(ms),
                this,
                &ActivityDatabase::RecordBatchedActionsWhileTesting);
 }
 
 }  // namespace extensions