Move the sqlite error handler to a single location...

chrome/browser/history/history_database.cc

 // Copyright (c) 2009 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 "chrome/browser/history/history_database.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
 #include "app/sql/transaction.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
+#include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
 namespace history {
 
 namespace {
 
 // Current version number. We write databases at the "current" version number,
 // but any previous version that can read the "compatible" one can make do with
 // or database without *too* many bad effects.
 static const int kCurrentVersionNumber = 17;
 static const int kCompatibleVersionNumber = 16;
@@ skipping 26 matching lines @@
 
 HistoryDatabase::HistoryDatabase()
     : needs_version_17_migration_(false) {
 }
 
 HistoryDatabase::~HistoryDatabase() {
 }
 
 InitStatus HistoryDatabase::Init(const FilePath& history_name,
                                  const FilePath& bookmarks_path) {
+  // Set the exceptional sqlite error handler.
+  db_.set_error_delegate(GetErrorHandlerForHistoryDb());
+
   // Set the database page size to something a little larger to give us
   // better performance (we're typically seek rather than bandwidth limited).
   // This only has an effect before any tables have been created, otherwise
   // this is a NOP. Must be a power of 2 and a max of 8192.
   db_.set_page_size(4096);
 
   // Increase the cache size. The page size, plus a little extra, times this
   // value, tells us how much memory the cache will use maximum.
   // 6000 * 4MB = 24MB
   // TODO(brettw) scale this value to the amount of available memory.
@@ skipping 213 matching lines @@
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);");
 
   // Erase all the full text index files. These will take a while to update and
   // are less important, so we just blow them away. Same with the archived
   // database.
   needs_version_17_migration_ = true;
 }
 #endif
 
 }  // namespace history