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

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

 // Copyright (c) 2011 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 <set>
 #include <vector>
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/activity_log/api_actions.h"
 #include "chrome/browser/extensions/activity_log/blocked_actions.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
+#include "sql/error_delegate_util.h"
 #include "third_party/re2/re2/re2.h"
 
 namespace {
 
 // Concatenate arguments.
 std::string MakeArgList(const ListValue* args) {
   std::string call_signature;
   ListValue::const_iterator it = args->begin();
   for (; it != args->end(); ++it) {
     std::string arg;
@@ skipping 122 matching lines @@
   // We initialize the database whether or not the AL is enabled, since we might
   // be enabled later on. If the database cannot be initialized for some
   // reason, we keep chugging along but nothing will get recorded. If the UI is
   // available, things will still get sent to the UI even if nothing
   // is being written to the database.
   db_ = new ActivityDatabase();
   if (!has_threads_) return;
   base::FilePath base_dir = profile->GetPath();
   base::FilePath database_name = base_dir.Append(
       chrome::kExtensionActivityLogFilename);
+  db_->SetErrorCallback(base::Bind(&ActivityLog::DatabaseErrorCallback,
+                                   base::Unretained(this)));
   ScheduleAndForget(&ActivityDatabase::Init, database_name);
 }
 
 void ActivityLog::Shutdown() {
   if (!first_time_checking_ && tracker_) tracker_->RemoveObserver(this);
 }
 
 ActivityLog::~ActivityLog() {
-  if (has_threads_)
-    ScheduleAndForget(&ActivityDatabase::Close);
-  else
-    db_->Close();
+  ScheduleAndForget(&ActivityDatabase::Close);
 }
 
 // We can't register for the InstallTrackerFactory events or talk to the
 // extension service in the constructor, so we do that here the first time
 // this is called (as identified by first_time_checking_).
 bool ActivityLog::IsLogEnabled() {
   if (!first_time_checking_) return enabled_;
   if (!has_threads_) return false;
   tracker_ = InstallTrackerFactory::GetForProfile(profile_);
   tracker_->AddObserver(this);
@@ skipping 251 matching lines @@
                    on_url,
                    web_contents->GetTitle(),
                    std::string(),  // no api call here
                    script_names.get(),
                    DomActionType::INSERTED,
                    extra);
     }
   }
 }
 
+void ActivityLog::DatabaseErrorCallback(int error, sql::Statement* stmt) {
+  if (sql::IsErrorCatastrophic(error))
+    ScheduleAndForget(&ActivityDatabase::KillDatabase);
+}
+
 }  // namespace extensions