Add support to process favicons from Web Manifests

chrome/browser/extensions/favicon_downloader.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/favicon_downloader.h"
 
 #include "base/bind.h"
 #include "components/favicon/content/content_favicon_driver.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 45 matching lines @@
 }
 
 std::vector<content::FaviconURL>
     FaviconDownloader::GetFaviconURLsFromWebContents() {
   favicon::ContentFaviconDriver* content_favicon_driver =
       web_contents()
           ? favicon::ContentFaviconDriver::FromWebContents(web_contents())
           : 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(
     const std::vector<content::FaviconURL>& favicon_urls) {
   std::vector<GURL> urls;
   for (std::vector<content::FaviconURL>::const_iterator it =
            favicon_urls.begin();
        it != favicon_urls.end(); ++it) {
     if (it->icon_type != content::FaviconURL::INVALID_ICON)
       urls.push_back(it->icon_url);
@@ skipping 49 matching lines @@
 void FaviconDownloader::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   // Only consider the first candidates we are given. This prevents pages that
   // change their favicon from spamming us.
   if (!need_favicon_urls_)
     return;
 
   need_favicon_urls_ = false;
   FetchIcons(candidates);
 }