Add support to process favicons from Web Manifests

components/favicon/core/favicon_driver_impl.cc

 // Copyright 2015 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 "components/favicon/core/favicon_driver_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
@@ skipping 80 matching lines @@
                                                    bool force_reload) {
   if (favicon_service_) {
     favicon_service_->SetFaviconOutOfDateForPage(url);
     if (force_reload)
       favicon_service_->ClearUnableToDownloadFavicons();
   }
 }
 
 void FaviconDriverImpl::OnUpdateCandidates(
     const GURL& page_url,
-    const std::vector<FaviconURL>& candidates) {
-  DCHECK(!candidates.empty());
+    const std::vector<FaviconURL>& candidates,
+    const 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_) {
+    // We feed in the Web Manifest URL (if any) to the instance handling type
+    // FAVICON, because those compete which each other (i.e. manifest icons
+    // override inline favicons).
+    handler->OnUpdateCandidates(page_url, candidates,
+                                handler->icon_types() & favicon_base::FAVICON
+                                    ? manifest_url
+                                    : GURL::EmptyGURL());
+  }
 }
 
 }  // namespace favicon