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

chrome/browser/history/text_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 <limits>
 #include <set>
 
 #include "chrome/browser/history/text_database.h"
 
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 
 // There are two tables in each database, one full-text search (FTS) table which
 // indexes the contents and title of the pages. The other is a regular SQLITE
 // table which contains non-indexed information about the page. All columns of
 // a FTS table are indexed using the text search algorithm, which isn't what we
 // want for things like times. If this were in the FTS table, there would be
 // different words in the index for each time number.
 //
 // "pages" FTS table:
 //   url    URL of the page so searches will match the URL.
@@ skipping 19 matching lines @@
 // create statement. These are the 0-based indices (as strings) of the
 // corresponding columns.
 const char kTitleColumnIndex[] = "1";
 const char kBodyColumnIndex[] = "2";
 
 // The string prepended to the database identifier to generate the filename.
 const FilePath::CharType kFilePrefix[] = FILE_PATH_LITERAL("History Index ");
 
 }  // namespace
 
-// This class handles the exceptional sqlite errors that we might encounter
-// if for example the db is corrupted. Right now we just generate a UMA
-// histogram for release and an assert for debug builds.
-class TextDbSqliteErrrorHandler : public sql::ErrorDelegate {
- public:
-  virtual int OnError(int error, sql::Connection* connection,
-                      sql::Statement* stmt) {
-    NOTREACHED() << "history db sqlite error " << error;
-    RecordErrorInHistogram(error);
-    return error;
-  }
- private:
-  static void RecordErrorInHistogram(int error) {
-    // The histogram values from sqlite result codes go currently from 1 to
-    // 26 currently but 100 gives them room to grow.
-    static LinearHistogram histogram("Sqlite.History.Error", 1, 50, 51);
-    histogram.SetFlags(kUmaTargetedHistogramFlag);
-    histogram.Add(error);
-  }
-};
-
 TextDatabase::TextDatabase(const FilePath& path,
                            DBIdent id,
                            bool allow_create)
     : path_(path),
       ident_(id),
       allow_create_(allow_create) {
   // Compute the file name.
   file_name_ = path_.Append(IDToFileName(ident_));
 }
 
@@ skipping 43 matching lines @@
 }
 
 bool TextDatabase::Init() {
   // Make sure, if we're not allowed to create the file, that it exists.
   if (!allow_create_) {
     if (!file_util::PathExists(file_name_))
       return false;
   }
 
   // Set the exceptional sqlite error handler.
-  db_.set_error_delegate(new TextDbSqliteErrrorHandler());
+  db_.set_error_delegate(GetErrorHandlerForTextDb());
 
   // 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(2096);
 
   // The default cache size is 2000 which give >8MB of data. Since we will often
   // have 2-3 of these objects, each with their own 8MB, this adds up very fast.
   // We therefore reduce the size so when there are multiple objects, we're not
@@ skipping 236 matching lines @@
   } else {
     // Since we got the results in order, we know the last item is the last
     // time we considered.
     *first_time_searched = results->back().time;
   }
 
   statement.Reset();
 }
 
 }  // namespace history