Change FaviconData to be able to return data for multiple bitmaps for same icon URL

chrome/browser/history/history_types.cc

Index: chrome/browser/history/history_types.cc
diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc
index d1c572855c6783ccc47a081463b88c867ae94ffb..61aecc3f3008b9ea3e01dc9fed0a283d15f4e755 100644
--- a/chrome/browser/history/history_types.cc
+++ b/chrome/browser/history/history_types.cc
@@ -90,14 +90,6 @@ VisitRow::VisitRow(URLID arg_url_id,
 VisitRow::~VisitRow() {
 }
 
-// Favicons -------------------------------------------------------------------
-
-ImportedFaviconUsage::ImportedFaviconUsage() {
-}
-
-ImportedFaviconUsage::~ImportedFaviconUsage() {
-}
-
 // StarredEntry ----------------------------------------------------------------
 
 StarredEntry::StarredEntry()
@@ -429,18 +421,22 @@ IconMapping::IconMapping()
 
 IconMapping::~IconMapping() {}
 
-// FaviconData ----------------------------------------------------------------
+// FaviconBitmapResult --------------------------------------------------------
+
+FaviconBitmapResult::FaviconBitmapResult()
+    : expired(false),
+      icon_type(history::INVALID_ICON) {
+}
 
-FaviconData::FaviconData()
-  : known_icon(false),
-    expired(false),
-    icon_type(history::INVALID_ICON) {
+FaviconBitmapResult::~FaviconBitmapResult() {
 }
 
-FaviconData::~FaviconData() {}
+// FaviconImageResult ---------------------------------------------------------
 
-bool FaviconData::is_valid() {
-  return known_icon && image_data.get() && image_data->size();
+FaviconImageResult::FaviconImageResult() {
+}
+
+FaviconImageResult::~FaviconImageResult() {
 }
 
 // FaviconBitmap --------------------------------------------------------------
@@ -453,4 +449,12 @@ FaviconBitmap::FaviconBitmap()
 FaviconBitmap::~FaviconBitmap() {
 }
 
+// ImportedFaviconUsage --------------------------------------------------------
+
+ImportedFaviconUsage::ImportedFaviconUsage() {
+}
+
+ImportedFaviconUsage::~ImportedFaviconUsage() {
+}
+
 }  // namespace history