[sql] Annotate sql::Recovery failure cases.

chrome/browser/history/thumbnail_database.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/history/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 403 matching lines @@
   RECOVERY_EVENT_FAILED_META_INIT,
   RECOVERY_EVENT_FAILED_META_VERSION,
   RECOVERY_EVENT_DEPRECATED,
   RECOVERY_EVENT_FAILED_V5_INITSCHEMA,
   RECOVERY_EVENT_FAILED_V5_AUTORECOVER_FAVICONS,
   RECOVERY_EVENT_FAILED_V5_AUTORECOVER_ICON_MAPPING,
   RECOVERY_EVENT_RECOVERED_VERSION5,
   RECOVERY_EVENT_FAILED_AUTORECOVER_FAVICONS,
   RECOVERY_EVENT_FAILED_AUTORECOVER_FAVICON_BITMAPS,
   RECOVERY_EVENT_FAILED_AUTORECOVER_ICON_MAPPING,
+  RECOVERY_EVENT_FAILED_COMMIT,
 
   // Always keep this at the end.
   RECOVERY_EVENT_MAX,
 };
 
 void RecordRecoveryEvent(RecoveryEventType recovery_event) {
   UMA_HISTOGRAM_ENUMERATION("History.FaviconsRecovery",
                             recovery_event, RECOVERY_EVENT_MAX);
 }
 
@@ skipping 174 matching lines @@
   // TODO(shess): Is it possible/likely to have broken foreign-key
   // issues with the tables?
   // - icon_mapping.icon_id maps to no favicons.id
   // - favicon_bitmaps.icon_id maps to no favicons.id
   // - favicons.id is referenced by no icon_mapping.icon_id
   // - favicons.id is referenced by no favicon_bitmaps.icon_id
   // This step is possibly not worth the effort necessary to develop
   // and sequence the statements, as it is basically a form of garbage
   // collection.
 
-  ignore_result(sql::Recovery::Recovered(recovery.Pass()));
+  if (!sql::Recovery::Recovered(recovery.Pass())) {
+    RecordRecoveryEvent(RECOVERY_EVENT_FAILED_COMMIT);
+    return;
+  }
 
   // Track the size of the recovered database relative to the size of
   // the input database.  The size should almost always be smaller,
   // unless the input database was empty to start with.  If the
   // percentage results are very low, something is awry.
   int64 final_size = 0;
   if (original_size > 0 &&
       file_util::GetFileSize(db_path, &final_size) &&
       final_size > 0) {
     int percentage = static_cast<int>(original_size * 100 / final_size);
@@ skipping 794 matching lines @@
   meta_table_.SetVersionNumber(7);
   meta_table_.SetCompatibleVersionNumber(std::min(7, kCompatibleVersionNumber));
   return true;
 }
 
 bool ThumbnailDatabase::IsFaviconDBStructureIncorrect() {
   return !db_.IsSQLValid("SELECT id, url, icon_type FROM favicons");
 }
 
 }  // namespace history