Index: chrome/browser/history/history_backend.cc |
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc |
index 015991a29a2f58c8a17eef6ea2af014dbe334113..5bc0dd3fcc87dc1333d490fdc492c1946a89d930 100644 |
--- a/chrome/browser/history/history_backend.cc |
+++ b/chrome/browser/history/history_backend.cc |
@@ -1707,9 +1707,9 @@ void HistoryBackend::UpdateFavIconMappingAndFetchImpl( |
bool know_favicon = false; |
bool expired = true; |
scoped_refptr<RefCountedBytes> data; |
+ IconType returned_icon_type = INVALID_ICON; |
if (thumbnail_db_.get()) { |
- IconType returned_icon_type; |
const FavIconID favicon_id = |
thumbnail_db_->GetFavIconIDForFavIconURL( |
icon_url, icon_types, &returned_icon_type); |
@@ -1731,7 +1731,7 @@ void HistoryBackend::UpdateFavIconMappingAndFetchImpl( |
} |
request->ForwardResult(GetFavIconRequest::TupleType( |
request->handle(), know_favicon, data, expired, |
- icon_url)); |
+ icon_url, returned_icon_type)); |
} |
void HistoryBackend::GetFavIconForURL( |
@@ -1744,6 +1744,7 @@ void HistoryBackend::GetFavIconForURL( |
bool know_favicon = false; |
bool expired = false; |
GURL icon_url; |
+ IconType icon_type = INVALID_ICON; |
scoped_refptr<RefCountedBytes> data; |
@@ -1761,6 +1762,7 @@ void HistoryBackend::GetFavIconForURL( |
know_favicon = true; |
expired = (Time::Now() - last_updated) > |
TimeDelta::FromDays(kFavIconRefetchDays); |
+ icon_type = icon_mappings.front().icon_type; |
} |
UMA_HISTOGRAM_TIMES("History.GetFavIconForURL", |
@@ -1769,7 +1771,7 @@ void HistoryBackend::GetFavIconForURL( |
request->ForwardResult( |
GetFavIconRequest::TupleType(request->handle(), know_favicon, data, |
- expired, icon_url)); |
+ expired, icon_url, icon_type)); |
} |
void HistoryBackend::SetFavIcon( |