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

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 137 matching lines @@
 
   // BrowserContextKeyedService
   virtual void Shutdown() OVERRIDE;
 
  private:
   friend class ActivityLogFactory;
 
   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(
       const std::string& extension_id,
       const std::string& api_call,
       ListValue* args,
       const std::string& extra,
       const APIAction::Type type);
 
   // TabHelper::ScriptExecutionObserver implementation.
   // Fires when a ContentScript is executed.
   virtual void OnScriptsExecuted(
       const content::WebContents* web_contents,
       const ExecutingScriptsMap& extension_ids,
       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.
   template<typename DatabaseFunc>
   void ScheduleAndForget(DatabaseFunc func) {
     if (!has_threads_) return;
     BrowserThread::PostTask(BrowserThread::DB,
                             FROM_HERE,
                             base::Bind(func, base::Unretained(db_)));
   }
@@ skipping 67 matching lines @@
   virtual content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityLogFactory);
 };
 
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVITY_LOG_ACTIVITY_LOG_H_