Extension activity log database refactoring (step 2)

chrome/browser/extensions/activity_log/activity_database.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_DATABASE_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_DATABASE_H_
 
 #include <string>
 #include <vector>
 #include "base/basictypes.h"
@@ skipping 75 matching lines @@
 
   // Need to call Init to actually use the ActivityDatabase.  The Delegate
   // provides hooks for an ActivityLogPolicy to control the database schema and
   // reads/writes.
   explicit ActivityDatabase(Delegate* delegate);
 
   // Opens the DB.  This invokes OnDatabaseInit in the delegate to create or
   // update the database schema if needed.
   void Init(const base::FilePath& db_name);
 
-  // The ActivityLog should call this to kill the ActivityDatabase.
+  // An ActivityLogPolicy should call this to kill the ActivityDatabase.
   void Close();
 
-  void LogInitFailure();
-
-  // Record a DOMction in the database.
-  void RecordDOMAction(scoped_refptr<DOMAction> action);
-
-  // Record a APIAction in the database.
-  void RecordAPIAction(scoped_refptr<APIAction> action);
-
-  // Record a BlockedAction in the database.
-  void RecordBlockedAction(scoped_refptr<BlockedAction> action);
-
   // Record an Action in the database.
   void RecordAction(scoped_refptr<Action> action);
 
   // Gets all actions for a given extension for the specified day. 0 = today,
   // 1 = yesterday, etc. Only returns 1 day at a time. Actions are sorted from
   // newest to oldest.
   scoped_ptr<std::vector<scoped_refptr<Action> > > GetActions(
       const std::string& extension_id, const int days_ago);
 
   // Handle errors in database writes.
   void DatabaseErrorCallback(int error, sql::Statement* stmt);
 
   bool is_db_valid() const { return valid_db_; }
 
   // For unit testing only.
   void SetBatchModeForTesting(bool batch_mode);
   void SetClockForTesting(base::Clock* clock);
   void SetTimerForTesting(int milliseconds);
 
+  // A helper method for initializing or upgrading a database table.  The
+  // content_fields array should list the names of all of the columns in the
+  // database. The field_types should specify the types of the corresponding
+  // columns (e.g., INTEGER or LONGVARCHAR). There should be the same number of
+  // field_types as content_fields, since the two arrays should correspond.
+  static bool InitializeTable(sql::Connection* db,
+                              const char* table_name,
+                              const char* content_fields[],
+                              const char* field_types[],
+                              const int num_content_fields);
+
  private:
   // This should never be invoked by another class. Use Close() to order a
   // suicide.
   virtual ~ActivityDatabase();
 
-  sql::InitStatus InitializeTable(const char* table_name,
-                                  const char* table_structure);
-
   // When we're in batched mode (which is on by default), we write to the db
   // every X minutes instead of on every API call. This prevents the annoyance
   // of writing to disk multiple times a second.
   void StartTimer();
   void RecordBatchedActions();
 
+  void LogInitFailure();
+
   // If an error is unrecoverable or occurred while we were trying to close
   // the database properly, we take "emergency" actions: break any outstanding
   // transactions, raze the database, and close. When next opened, the
   // database will be empty.
   void HardFailureClose();
 
   // Doesn't actually close the DB, but changes bools to prevent further writes
   // or changes to it.
   void SoftFailureClose();
 
@@ skipping 11 matching lines @@
   std::vector<scoped_refptr<Action> > batched_actions_;
   base::RepeatingTimer<ActivityDatabase> timer_;
   bool already_closed_;
   bool did_init_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityDatabase);
 };
 
 }  // namespace extensions
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_DATABASE_H_