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

chrome/browser/webdata/web_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/webdata/web_database.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
 #include "base/string_util.h"
 #include "base/time.h"
+#include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "webkit/glue/password_form.h"
 
 // Encryptor is the *wrong* way of doing things; we need to turn it into a
 // bottleneck to use the platform methods (e.g. Keychain on the Mac, Gnome
 // Keyring / KWallet on Linux). That's going to take a massive change in its
 // API... see:
 // http://code.google.com/p/chromium/issues/detail?id=8205 (Linux)
 #include "chrome/browser/password_manager/encryptor.h"
@@ skipping 99 matching lines @@
 
 void WebDatabase::BeginTransaction() {
   db_.BeginTransaction();
 }
 
 void WebDatabase::CommitTransaction() {
   db_.CommitTransaction();
 }
 
 bool WebDatabase::Init(const FilePath& db_name) {
+  // Set the exceptional sqlite error handler.
+  db_.set_error_delegate(GetErrorHandlerForWebDb());
+
   // We don't store that much data in the tables so use a small page size.
   // This provides a large benefit for empty tables (which is very likely with
   // the tables we create).
   db_.set_page_size(2048);
 
   // We shouldn't have much data and what access we currently have is quite
   // infrequent. So we go with a small cache size.
   db_.set_cache_size(32);
 
   // Run the database in exclusive mode. Nobody else should be accessing the
@@ skipping 1003 matching lines @@
 
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return;
   }
 }