📰 Merge the has_fetch_more and has_reload actions

components/ntp_snippets/remote/remote_suggestions_fetcher.cc

 // Copyright 2016 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_suggestions_fetcher.h"
 
 #include <cstdlib>
 #include <utility>
 
 #include "base/files/file_path.h"
@@ skipping 193 matching lines @@
 
 }  // namespace
 
 CategoryInfo BuildArticleCategoryInfo(
     const base::Optional<base::string16>& title) {
   return CategoryInfo(
       title.has_value() ? title.value()
                         : l10n_util::GetStringUTF16(
                               IDS_NTP_ARTICLE_SUGGESTIONS_SECTION_HEADER),
       ContentSuggestionsCardLayout::FULL_CARD,
-      // TODO(dgn): merge has_more_action and has_reload_action when we remove
-      // the kFetchMoreFeature flag. See https://crbug.com/667752
-      /*has_more_action=*/true,
-      /*has_reload_action=*/true,
+      /*has_fetch_action=*/true,
       /*has_view_all_action=*/false,
       /*show_if_empty=*/true,
       l10n_util::GetStringUTF16(IDS_NTP_ARTICLE_SUGGESTIONS_SECTION_EMPTY));
 }
 
 CategoryInfo BuildRemoteCategoryInfo(const base::string16& title,
                                      bool allow_fetching_more_results) {
   return CategoryInfo(
       title, ContentSuggestionsCardLayout::FULL_CARD,
-      // TODO(dgn): merge has_more_action and has_reload_action when we remove
-      // the kFetchMoreFeature flag. See https://crbug.com/667752
-      /*has_more_action=*/allow_fetching_more_results,
-      /*has_reload_action=*/allow_fetching_more_results,
+      /*has_fetch_action=*/allow_fetching_more_results,
       /*has_view_all_action=*/false,
       /*show_if_empty=*/false,
       // TODO(tschumann): The message for no-articles is likely wrong
       // and needs to be added to the stubby protocol if we want to
       // support it.
       l10n_util::GetStringUTF16(IDS_NTP_ARTICLE_SUGGESTIONS_SECTION_EMPTY));
 }
 
 RemoteSuggestionsFetcher::FetchedCategory::FetchedCategory(Category c,
                                                            CategoryInfo&& info)
@@ skipping 380 matching lines @@
       break;
     case Personalization::kNonPersonal:
       return "Only non-personalized";
       break;
   }
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace ntp_snippets