1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc
index f0e45f9..d4d1b5a 100644
--- a/chrome/browser/history/thumbnail_database.cc
+++ b/chrome/browser/history/thumbnail_database.cc
@@ -10,6 +10,7 @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted_memory.h"
+#include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
@@ -197,6 +198,10 @@ sql::InitStatus ThumbnailDatabase::Init(
     return sql::INIT_FAILURE;
   }
 
+  // Log in a UMA histogram if the structure of the favicons database is not
+  // what it should be.
+  LogIfFaviconDBStructureIncorrect();
+
   return sql::INIT_OK;
 }
 
@@ -321,6 +326,11 @@ bool ThumbnailDatabase::InitFaviconBitmapsIndex() {
                      "favicon_bitmaps(icon_id)");
 }
 
+void ThumbnailDatabase::LogIfFaviconDBStructureIncorrect() {
+  if (!db_.IsSQLValid("SELECT id, url, icon_type, sizes FROM favicons"))
+    UMA_HISTOGRAM_BOOLEAN("ThumbnailDatabase.InvalidFaviconsDBStructure", true);
+}
+
 void ThumbnailDatabase::BeginTransaction() {
   db_.BeginTransaction();
 }