Add support to process favicons from Web Manifests

components/favicon/core/favicon_driver_impl.cc

Index: components/favicon/core/favicon_driver_impl.cc
diff --git a/components/favicon/core/favicon_driver_impl.cc b/components/favicon/core/favicon_driver_impl.cc
index 61e5b084c4b114c1ca818a8ce070e436cc09ede0..c1944d09684515bf879c752f2bc5ad56be6748ce 100644
--- a/components/favicon/core/favicon_driver_impl.cc
+++ b/components/favicon/core/favicon_driver_impl.cc
@@ -92,14 +92,16 @@ void FaviconDriverImpl::SetFaviconOutOfDateForPage(const GURL& url,
   }
 }
 
-void FaviconDriverImpl::OnUpdateFaviconURL(
+void FaviconDriverImpl::OnUpdateCandidates(
     const GURL& page_url,
-    const std::vector<FaviconURL>& candidates) {
-  DCHECK(!candidates.empty());
+    const std::vector<FaviconURL>& candidates,
+    const base::Optional<GURL>& manifest_url) {
   RecordCandidateMetrics(candidates);
-  favicon_handler_->OnUpdateFaviconURL(page_url, candidates);
-  if (touch_icon_handler_.get())
-    touch_icon_handler_->OnUpdateFaviconURL(page_url, candidates);
+  favicon_handler_->OnUpdateCandidates(page_url, candidates, manifest_url);
+  if (touch_icon_handler_.get()) {
+    touch_icon_handler_->OnUpdateCandidates(page_url, candidates,
+                                            base::nullopt);
+  }
 }
 
 }  // namespace favicon