| Index: components/favicon/content/content_favicon_driver.cc
|
| diff --git a/components/favicon/content/content_favicon_driver.cc b/components/favicon/content/content_favicon_driver.cc
|
| index c4aa894affd32a4b92cf54a7ed393a4b8fac2b11..5d71df02da46474fa226b884d773367f998f5e66 100644
|
| --- a/components/favicon/content/content_favicon_driver.cc
|
| +++ b/components/favicon/content/content_favicon_driver.cc
|
| @@ -161,11 +161,14 @@ void ContentFaviconDriver::DidUpdateFaviconURL(
|
|
|
| // Ignore the update if there is no last committed navigation entry. This can
|
| // occur when loading an initially blank page.
|
| - if (!web_contents()->GetController().GetLastCommittedEntry())
|
| + content::NavigationEntry* entry =
|
| + web_contents()->GetController().GetLastCommittedEntry();
|
| + if (!entry)
|
| return;
|
|
|
| favicon_urls_ = candidates;
|
| - OnUpdateFaviconURL(FaviconURLsFromContentFaviconURLs(candidates));
|
| + OnUpdateFaviconURL(entry->GetURL(),
|
| + FaviconURLsFromContentFaviconURLs(candidates));
|
| }
|
|
|
| void ContentFaviconDriver::DidStartNavigationToPendingEntry(
|
|
|