Remove recovery diagnostics for the archived history database.

The reason is that the archived history database feature has been removed as of r275159.

BUG=359377

Review URL: https://codereview.chromium.org/334633006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281003 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 18 deletions

diff --git a/chrome/browser/diagnostics/diagnostics_metrics.cc b/chrome/browser/diagnostics/diagnostics_metrics.cc
index 7dd6ec7..51d4769 100644
--- a/chrome/browser/diagnostics/diagnostics_metrics.cc
+++ b/chrome/browser/diagnostics/diagnostics_metrics.cc
@@ -42,7 +42,7 @@ const TestNameInfo kTestNameInfo[] = {
     {"PathUserData", "User data path"},
     {"Version", "Chrome version test"},
     {"SQLiteIntegrityAppCache", "Application cache database"},
-    {"SQLiteIntegrityArchivedHistory", "Archived history database"},
+    {"SQLiteIntegrityArchivedHistory", "Archived history database (obsolete)"},
     {"SQLiteIntegrityCookie", "Cookie database"},
     {"SQLiteIntegrityDatabaseTracker", "Database tracker database"},
     {"SQLiteIntegrityHistory", "History database"},
@@ -94,7 +94,7 @@ std::string GetTestDescription(DiagnosticsTestId id) {
   TEST_CASE(name, DIAGNOSTICS_PATH_USER_DATA_TEST);                    \
   TEST_CASE(name, DIAGNOSTICS_VERSION_TEST);                           \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_APP_CACHE_TEST);        \
-  TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST); \
+  TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST_OBSOLETE);\
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST);           \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_DATABASE_TRACKER_TEST); \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST);          \
diff --git a/chrome/browser/diagnostics/diagnostics_metrics.h b/chrome/browser/diagnostics/diagnostics_metrics.h
index 2d84bd0..67ccd64 100644
--- a/chrome/browser/diagnostics/diagnostics_metrics.h
+++ b/chrome/browser/diagnostics/diagnostics_metrics.h
@@ -26,7 +26,7 @@ enum DiagnosticsTestId {
   DIAGNOSTICS_PATH_USER_DATA_TEST,
   DIAGNOSTICS_VERSION_TEST,
   DIAGNOSTICS_SQLITE_INTEGRITY_APP_CACHE_TEST,
-  DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST,
+  DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST_OBSOLETE,
   DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST,
   DIAGNOSTICS_SQLITE_INTEGRITY_DATABASE_TRACKER_TEST,
   DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST,
diff --git a/chrome/browser/diagnostics/diagnostics_model.cc b/chrome/browser/diagnostics/diagnostics_model.cc
index ff28065..0dd329a 100644
--- a/chrome/browser/diagnostics/diagnostics_model.cc
+++ b/chrome/browser/diagnostics/diagnostics_model.cc
@@ -24,14 +24,14 @@ namespace diagnostics {
 // This is the count of diagnostic tests on each platform.  This should
 // only be used by testing code.
 #if defined(OS_WIN)
-const int DiagnosticsModel::kDiagnosticsTestCount = 18;
+const int DiagnosticsModel::kDiagnosticsTestCount = 17;
 #elif defined(OS_MACOSX)
-const int DiagnosticsModel::kDiagnosticsTestCount = 14;
+const int DiagnosticsModel::kDiagnosticsTestCount = 13;
 #elif defined(OS_POSIX)
 #if defined(OS_CHROMEOS)
-const int DiagnosticsModel::kDiagnosticsTestCount = 18;
+const int DiagnosticsModel::kDiagnosticsTestCount = 17;
 #else
-const int DiagnosticsModel::kDiagnosticsTestCount = 16;
+const int DiagnosticsModel::kDiagnosticsTestCount = 15;
 #endif
 #endif
 
@@ -164,7 +164,6 @@ class DiagnosticsModelWin : public DiagnosticsModelImpl {
     tests_.push_back(MakeSqliteWebDataDbTest());
     tests_.push_back(MakeSqliteCookiesDbTest());
     tests_.push_back(MakeSqliteHistoryDbTest());
-    tests_.push_back(MakeSqliteArchivedHistoryDbTest());
     tests_.push_back(MakeSqliteThumbnailsDbTest());
     tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest());
   }
@@ -188,7 +187,6 @@ class DiagnosticsModelMac : public DiagnosticsModelImpl {
     tests_.push_back(MakeSqliteWebDataDbTest());
     tests_.push_back(MakeSqliteCookiesDbTest());
     tests_.push_back(MakeSqliteHistoryDbTest());
-    tests_.push_back(MakeSqliteArchivedHistoryDbTest());
     tests_.push_back(MakeSqliteThumbnailsDbTest());
     tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest());
   }
@@ -214,7 +212,6 @@ class DiagnosticsModelPosix : public DiagnosticsModelImpl {
     tests_.push_back(MakeSqliteWebDataDbTest());
     tests_.push_back(MakeSqliteCookiesDbTest());
     tests_.push_back(MakeSqliteHistoryDbTest());
-    tests_.push_back(MakeSqliteArchivedHistoryDbTest());
     tests_.push_back(MakeSqliteThumbnailsDbTest());
     tests_.push_back(MakeSqliteWebDatabaseTrackerDbTest());
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index 6a92c9d..2982d2b 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -200,13 +200,6 @@ class SqliteIntegrityTest : public DiagnosticsTest {
 
 }  // namespace
 
-DiagnosticsTest* MakeSqliteArchivedHistoryDbTest() {
-  return new SqliteIntegrityTest(
-      SqliteIntegrityTest::NO_FLAGS_SET,
-      DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST,
-      base::FilePath(chrome::kArchivedHistoryFilename));
-}
-
 DiagnosticsTest* MakeSqliteCookiesDbTest() {
   return new SqliteIntegrityTest(SqliteIntegrityTest::CRITICAL,
                                  DIAGNOSTICS_SQLITE_INTEGRITY_COOKIE_TEST,
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.h b/chrome/browser/diagnostics/sqlite_diagnostics.h
index 7c09815..d098e07 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.h
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.h
@@ -21,7 +21,6 @@ enum SQLiteIntegrityOutcomeCode {
 };
 
 // Factories for the database integrity tests we run in diagnostic mode.
-DiagnosticsTest* MakeSqliteArchivedHistoryDbTest();
 DiagnosticsTest* MakeSqliteCookiesDbTest();
 DiagnosticsTest* MakeSqliteHistoryDbTest();
 DiagnosticsTest* MakeSqliteThumbnailsDbTest();