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/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
@@ skipping 74 matching lines @@
 
 void FaviconDriverImpl::SetFaviconOutOfDateForPage(const GURL& url,
                                                    bool force_reload) {
   if (favicon_service_) {
     favicon_service_->SetFaviconOutOfDateForPage(url);
     if (force_reload)
       favicon_service_->ClearUnableToDownloadFavicons();
   }
 }
 
-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