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 2c0bfa4bda70281f1a3136934d4975b25b93ce31..6865d8e2b15351f11dd71db7b5ad13a9c5ef90e9 100644
--- a/components/favicon/core/favicon_driver_impl.cc
+++ b/components/favicon/core/favicon_driver_impl.cc
@@ -98,11 +98,15 @@ void FaviconDriverImpl::SetFaviconOutOfDateForPage(const GURL& url,
 
 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);
-  for (const std::unique_ptr<FaviconHandler>& handler : handlers_)
-    handler->OnUpdateCandidates(page_url, candidates);
+  for (const std::unique_ptr<FaviconHandler>& handler : handlers_) {
+    handler->OnUpdateCandidates(page_url, candidates,
+                                handler->icon_types() & favicon_base::FAVICON

[pkotwicz, 2017/05/12 06:13:29]

We should document why the manifest URL is passed to the favicon_base::FAVICON
FaviconHandler in a comment

[mastiz, 2017/05/12 13:31:33]

Done.

+                                    ? manifest_url
+                                    : base::nullopt);
+  }
 }
 
 }  // namespace favicon