Revert 205059 "We were seeing ActivityLog memory leaks and assor..."

trunk/src/chrome/browser/extensions/activity_log/activity_log.h

Index: trunk/src/chrome/browser/extensions/activity_log/activity_log.h
===================================================================
--- trunk/src/chrome/browser/extensions/activity_log/activity_log.h	(revision 205306)
+++ trunk/src/chrome/browser/extensions/activity_log/activity_log.h	(working copy)
@@ -155,6 +155,9 @@
   explicit ActivityLog(Profile* profile);
   virtual ~ActivityLog();
 
+  // Reset the database in case of persistent catastrophic errors.
+  void DatabaseErrorCallback(int error, sql::Statement* stmt);
+
   // We log callbacks and API calls very similarly, so we handle them the same
   // way internally.
   void LogAPIActionInternal(
@@ -172,6 +175,9 @@
       int32 page_id,
       const GURL& on_url) OVERRIDE;
 
+  // The callback when initializing the database.
+  void OnDBInitComplete();
+
   // The Schedule methods dispatch the calls to the database on a
   // separate thread. We dispatch to the UI thread if the DB thread doesn't
   // exist, which should only happen in tests where there is no DB thread.