[Content suggestions] Allow to specify URLs for favicons

components/ntp_snippets/remote/remote_suggestion.cc

Index: components/ntp_snippets/remote/remote_suggestion.cc
diff --git a/components/ntp_snippets/remote/remote_suggestion.cc b/components/ntp_snippets/remote/remote_suggestion.cc
index 988d61a99945dcbdf2d0e273a6908db080d74403..d11594337400067ba808afa4eb50f5b6ec146cea 100644
--- a/components/ntp_snippets/remote/remote_suggestion.cc
+++ b/components/ntp_snippets/remote/remote_suggestion.cc
@@ -389,11 +389,17 @@ SnippetProto RemoteSuggestion::ToProto() const {
 ContentSuggestion RemoteSuggestion::ToContentSuggestion(
     Category category) const {
   GURL url = url_;
-  if (base::FeatureList::IsEnabled(kPreferAmpUrlsFeature) &&
-      !amp_url_.is_empty()) {
+  bool use_amp = base::FeatureList::IsEnabled(kPreferAmpUrlsFeature) &&
+                 !amp_url_.is_empty();
+  if (use_amp) {
     url = amp_url_;
   }
   ContentSuggestion suggestion(category, id(), url);
+  // Set url for fetching favicons if it differs from the main url (domains of
+  // AMP URLs sometimes failed to provide favicons).
+  if (use_amp) {
+    suggestion.set_url_with_favicon(url_);
+  }
   suggestion.set_title(base::UTF8ToUTF16(title_));
   suggestion.set_snippet_text(base::UTF8ToUTF16(snippet_));
   suggestion.set_publish_date(publish_date_);