[Content suggestions] Allow to specify URLs for favicons

components/ntp_snippets/remote/remote_suggestion.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/ntp_snippets/remote/remote_suggestion.h"
 
 #include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 371 matching lines @@
 
   if (!fetch_date_.is_null()) {
     result.set_fetch_date(fetch_date_.ToInternalValue());
   }
   return result;
 }
 
 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_);
   suggestion.set_publisher_name(base::UTF8ToUTF16(publisher_name_));
   suggestion.set_score(score_);
   if (should_notify_) {
     NotificationExtra extra;
     extra.deadline = notification_deadline_;
     suggestion.set_notification_extra(
         base::MakeUnique<NotificationExtra>(extra));
@@ skipping 21 matching lines @@
 }
 
 // static
 std::unique_ptr<RemoteSuggestion> RemoteSuggestion::MakeUnique(
     const std::vector<std::string>& ids,
     int remote_category_id) {
   return base::WrapUnique(new RemoteSuggestion(ids, remote_category_id));
 }
 
 }  // namespace ntp_snippets