Move ErrorDelegate to its own file and add static utility functions to ErrorDelegate

chrome/browser/diagnostics/sqlite_diagnostics.cc

 // Copyright (c) 2012 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/diagnostics/sqlite_diagnostics.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ skipping 77 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SqliteIntegrityTest);
 };
 
 // Uniquifier to use the sql::DiagnosticErrorDelegate template which
 // requires a static name() method.
 template <size_t unique>
 class HistogramUniquifier {
  public:
   static const char* name() {
     const char* kHistogramNames[] = {
-      "Sqlite.Cookie.Error",
       "Sqlite.History.Error",
       "Sqlite.Thumbnail.Error",
       "Sqlite.Text.Error",
       "Sqlite.Web.Error"
     };
     return kHistogramNames[unique];
   }
 };
 
 }  // namespace
 
-sql::ErrorDelegate* GetErrorHandlerForCookieDb() {
+sql::ErrorDelegate* GetErrorHandlerForHistoryDb() {
   return new sql::DiagnosticErrorDelegate<HistogramUniquifier<0> >();
 }
 
-sql::ErrorDelegate* GetErrorHandlerForHistoryDb() {
+sql::ErrorDelegate* GetErrorHandlerForThumbnailDb() {
   return new sql::DiagnosticErrorDelegate<HistogramUniquifier<1> >();
 }
 
-sql::ErrorDelegate* GetErrorHandlerForThumbnailDb() {
+sql::ErrorDelegate* GetErrorHandlerForTextDb() {
   return new sql::DiagnosticErrorDelegate<HistogramUniquifier<2> >();
 }
 
-sql::ErrorDelegate* GetErrorHandlerForTextDb() {
+sql::ErrorDelegate* GetErrorHandlerForWebDb() {
   return new sql::DiagnosticErrorDelegate<HistogramUniquifier<3> >();
 }
 
-sql::ErrorDelegate* GetErrorHandlerForWebDb() {
-  return new sql::DiagnosticErrorDelegate<HistogramUniquifier<4> >();
-}
-
 DiagnosticTest* MakeSqliteWebDbTest() {
   return new SqliteIntegrityTest(true, ASCIIToUTF16("Web DB"),
                                  FilePath(chrome::kWebDataFilename));
 }
 
 DiagnosticTest* MakeSqliteCookiesDbTest() {
   return new SqliteIntegrityTest(true, ASCIIToUTF16("Cookies DB"),
                                  FilePath(chrome::kCookieFilename));
 }
 
@@ skipping 19 matching lines @@
                                  appcache_db);
 }
 
 DiagnosticTest* MakeSqliteWebDatabaseTrackerDbTest() {
   FilePath databases_dir(webkit_database::kDatabaseDirectoryName);
   FilePath tracker_db =
       databases_dir.Append(webkit_database::kTrackerDatabaseFileName);
   return new SqliteIntegrityTest(false, ASCIIToUTF16("DatabaseTracker DB"),
                                  tracker_db);
 }