Remove recovery diagnostics for the archived history database.

chrome/browser/diagnostics/diagnostics_controller.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_controller.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 32 matching lines @@
 void DiagnosticsController::RecordRegularStartup() {
 #if defined(OS_CHROMEOS)  // Only collecting UMA stats on ChromeOS
   // Count the number of normal starts, so we can compare that with the number
   // of recovery runs to get a percentage.
   UMA_HISTOGRAM_ENUMERATION(
       "Diagnostics.RecoveryRun", RECOVERY_NOT_RUN, RECOVERY_RUN_METRICS_COUNT);
 
   // For each of the test types, record a normal start (no diagnostics run), so
   // we have a common denominator.
   for (int i = 0; i < DIAGNOSTICS_TEST_ID_COUNT; ++i) {
+    if (static_cast<DiagnosticsTestId>(i) ==
+        DIAGNOSTICS_SQLITE_INTEGRITY_ARCHIVED_HISTORY_TEST_OBSOLETE)
+      continue;
+
     RecordUMARecoveryResult(static_cast<DiagnosticsTestId>(i), RESULT_NOT_RUN);
     RecordUMATestResult(static_cast<DiagnosticsTestId>(i), RESULT_NOT_RUN);
   }
 #endif
 }
 
 // This entry point is called from early in startup when very few things have
 // been initialized, so be careful what you use.
 int DiagnosticsController::Run(const CommandLine& command_line,
                                DiagnosticsWriter* writer) {
@@ skipping 31 matching lines @@
     return -1;
   }
 
   writer_ = writer;
 
   model_->RecoverAll(writer_);
   return 0;
 }
 
 }  // namespace diagnostics