Index: chrome/browser/extensions/favicon_downloader.cc |
diff --git a/chrome/browser/extensions/favicon_downloader.cc b/chrome/browser/extensions/favicon_downloader.cc |
index fa6f2ad0e63cbbabaefa22e602302aefaed2c7dc..e0cdee4a48d2666f1f0bb7edb8bd52d9ee0131b4 100644 |
--- a/chrome/browser/extensions/favicon_downloader.cc |
+++ b/chrome/browser/extensions/favicon_downloader.cc |
@@ -63,8 +63,10 @@ std::vector<content::FaviconURL> |
: nullptr; |
// If favicon_urls() is empty, we are guaranteed that DidUpdateFaviconURLs has |
// not yet been called for the current page's navigation. |
- return content_favicon_driver ? content_favicon_driver->favicon_urls() |
- : std::vector<content::FaviconURL>(); |
+ return content_favicon_driver |
+ ? content_favicon_driver->favicon_urls().value_or( |
+ std::vector<content::FaviconURL>()) |
+ : std::vector<content::FaviconURL>(); |
} |
void FaviconDownloader::FetchIcons( |