Revert 276998 "Remove recovery diagnostics for the archived hist..."

trunk/src/chrome/browser/diagnostics/diagnostics_metrics.cc

 // Copyright 2013 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/diagnostics_metrics.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 24 matching lines @@
     {"JSONBookmarks", "Bookmark file"},
     {"JSONLocalState", "Local state integrity"},
     {"JSONPreferences", "User preferences integrity"},
     {"OperatingSystem", "Operating system supported version"},
     {"PathDictionaries", "App dictionaries directory path"},
     {"PathLocalState", "Local state path"},
     {"PathResources", "Resources path"},
     {"PathUserData", "User data path"},
     {"Version", "Chrome version test"},
     {"SQLiteIntegrityAppCache", "Application cache database"},
-    {"SQLiteIntegrityArchivedHistory", "Archived history database (obsolete)"},
+    {"SQLiteIntegrityArchivedHistory", "Archived history database"},
     {"SQLiteIntegrityCookie", "Cookie database"},
     {"SQLiteIntegrityDatabaseTracker", "Database tracker database"},
     {"SQLiteIntegrityHistory", "History database"},
     {"SQLiteIntegrityNSSCert", "NSS certificate database"},
     {"SQLiteIntegrityNSSKey", "NSS Key database"},
     {"SQLiteIntegrityThumbnails", "Thumbnails database"},
     {"SQLiteIntegrityWebData", "Web Data database"},
     // Add new entries in the same order as DiagnosticsTestId.
 };
 
@@ skipping 31 matching lines @@
   TEST_CASE(name, DIAGNOSTICS_JSON_BOOKMARKS_TEST);                    \
   TEST_CASE(name, DIAGNOSTICS_JSON_LOCAL_STATE_TEST);                  \
   TEST_CASE(name, DIAGNOSTICS_JSON_PREFERENCES_TEST);                  \
   TEST_CASE(name, DIAGNOSTICS_OPERATING_SYSTEM_TEST);                  \
   TEST_CASE(name, DIAGNOSTICS_PATH_DICTIONARIES_TEST);                 \
   TEST_CASE(name, DIAGNOSTICS_PATH_LOCAL_STATE_TEST);                  \
   TEST_CASE(name, DIAGNOSTICS_PATH_RESOURCES_TEST);                    \
   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_COOKIE_TEST);           \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_DATABASE_TRACKER_TEST); \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_HISTORY_TEST);          \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_NSS_CERT_TEST);         \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_NSS_KEY_TEST);          \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_THUMBNAILS_TEST);       \
   TEST_CASE(name, DIAGNOSTICS_SQLITE_INTEGRITY_WEB_DATA_TEST)
 
 void RecordUMARecoveryResult(DiagnosticsTestId id, RunResultMetrics result) {
   const std::string name("Diagnostics.Recovery." +
@@ skipping 11 matching lines @@
   switch (id) {
     TEST_CASES(name);  // See above
     default:
       NOTREACHED() << "Unhandled UMA Metric type" << id;
   }
 }
 #undef TEST_CASE
 #undef TEST_CASES
 
 }  // namespace diagnostics