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

chrome/browser/history/thumbnail_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/thumbnail_database.h"
 
 #include "app/gfx/codec/jpeg_codec.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
 #include "base/file_util.h"
 #include "base/time.h"
 #include "base/string_util.h"
+#include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/history/history_publisher.h"
 #include "chrome/browser/history/url_database.h"
 #include "chrome/common/thumbnail_score.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace history {
 
 // Version number of the database.
 static const int kCurrentVersionNumber = 3;
 static const int kCompatibleVersionNumber = 3;
 
 ThumbnailDatabase::ThumbnailDatabase() : history_publisher_(NULL) {
 }
 
 ThumbnailDatabase::~ThumbnailDatabase() {
   // The DBCloseScoper will delete the DB and the cache.
 }
 
 InitStatus ThumbnailDatabase::Init(const FilePath& db_name,
                                    const HistoryPublisher* history_publisher) {
   history_publisher_ = history_publisher;
 
+  // Set the exceptional sqlite error handler.
+  db_.set_error_delegate(GetErrorHandlerForThumbnailDb());
+
   // Set the database page size to something  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. We use a bigger
   // one because we're storing larger data (4-16K) in it, so we want a few
   // blocks per element.
   db_.set_page_size(4096);
 
   // The UI is generally designed to work well when the thumbnail database is
   // slow, so we can tolerate much less caching. The file is also very large
@@ skipping 387 matching lines @@
   // Rename the temporary one.
   if (!db_.Execute("ALTER TABLE temp_favicons RENAME TO favicons"))
     return false;
 
   // The renamed table needs the index (the temporary table doesn't have one).
   InitFavIconsIndex();
   return true;
 }
 
 }  // namespace history