📰 Merge the has_fetch_more and has_reload actions

components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.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_suggestions_provider_impl.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 570 matching lines @@
       base::UTF8ToUTF16(kTestJsonDefaultCategoryTitle);
 
   // Don't send an initial response -- we want to test what happens without any
   // server status.
   auto service = MakeSuggestionsProvider(/*set_empty_response=*/false);
 
   // The articles category should be there by default, and have a title.
   CategoryInfo info_before = service->GetCategoryInfo(articles_category());
   ASSERT_THAT(info_before.title(), Not(IsEmpty()));
   ASSERT_THAT(info_before.title(), Not(Eq(test_default_title)));
-  EXPECT_THAT(info_before.has_more_action(), Eq(true));
-  EXPECT_THAT(info_before.has_reload_action(), Eq(true));
+  EXPECT_THAT(info_before.has_fetch_action(), Eq(true));
   EXPECT_THAT(info_before.has_view_all_action(), Eq(false));
   EXPECT_THAT(info_before.show_if_empty(), Eq(true));
 
   std::string json_str_with_title(GetTestJson({GetSuggestion()}));
   LoadFromJSONString(service.get(), json_str_with_title);
 
   ASSERT_THAT(observer().SuggestionsForCategory(articles_category()),
               SizeIs(1));
   ASSERT_THAT(service->GetSuggestionsForTesting(articles_category()),
               SizeIs(1));
 
   // The response contained a title, |kTestJsonDefaultCategoryTitle|.
   // Make sure we updated the title in the CategoryInfo.
   CategoryInfo info_with_title = service->GetCategoryInfo(articles_category());
   EXPECT_THAT(info_before.title(), Not(Eq(info_with_title.title())));
   EXPECT_THAT(test_default_title, Eq(info_with_title.title()));
-  EXPECT_THAT(info_before.has_more_action(), Eq(true));
-  EXPECT_THAT(info_before.has_reload_action(), Eq(true));
+  EXPECT_THAT(info_before.has_fetch_action(), Eq(true));
   EXPECT_THAT(info_before.has_view_all_action(), Eq(false));
   EXPECT_THAT(info_before.show_if_empty(), Eq(true));
 }
 
 TEST_F(RemoteSuggestionsProviderImplTest, MultipleCategories) {
   auto service = MakeSuggestionsProvider();
   std::string json_str =
       MultiCategoryJsonBuilder()
           .AddCategory({GetSuggestionN(0)}, /*remote_category_id=*/1)
           .AddCategory({GetSuggestionN(1)}, /*remote_category_id=*/2)
@@ skipping 35 matching lines @@
     EXPECT_EQ(kSuggestionText, base::UTF16ToUTF8(suggestion.snippet_text()));
     EXPECT_EQ(GetDefaultCreationTime(), suggestion.publish_date());
     EXPECT_EQ(kSuggestionPublisherName,
               base::UTF16ToUTF8(suggestion.publisher_name()));
   }
 }
 
 TEST_F(RemoteSuggestionsProviderImplTest, ArticleCategoryInfo) {
   auto service = MakeSuggestionsProvider();
   CategoryInfo article_info = service->GetCategoryInfo(articles_category());
-  EXPECT_THAT(article_info.has_more_action(), Eq(true));
-  EXPECT_THAT(article_info.has_reload_action(), Eq(true));
+  EXPECT_THAT(article_info.has_fetch_action(), Eq(true));
   EXPECT_THAT(article_info.has_view_all_action(), Eq(false));
   EXPECT_THAT(article_info.show_if_empty(), Eq(true));
 }
 
 TEST_F(RemoteSuggestionsProviderImplTest, ExperimentalCategoryInfo) {
   auto service = MakeSuggestionsProvider();
   std::string json_str =
       MultiCategoryJsonBuilder()
           .AddCategory({GetSuggestionN(0)}, /*remote_category_id=*/1)
           .AddCategory({GetSuggestionN(1)}, kUnknownRemoteCategoryId)
           .Build();
   // Load data with multiple categories so that a new experimental category gets
   // registered.
   LoadFromJSONString(service.get(), json_str);
 
   CategoryInfo info = service->GetCategoryInfo(unknown_category());
-  EXPECT_THAT(info.has_more_action(), Eq(false));
-  EXPECT_THAT(info.has_reload_action(), Eq(false));
+  EXPECT_THAT(info.has_fetch_action(), Eq(false));
   EXPECT_THAT(info.has_view_all_action(), Eq(false));
   EXPECT_THAT(info.show_if_empty(), Eq(false));
 }
 
 TEST_F(RemoteSuggestionsProviderImplTest, AddRemoteCategoriesToCategoryRanker) {
   auto mock_ranker = base::MakeUnique<MockCategoryRanker>();
   MockCategoryRanker* raw_mock_ranker = mock_ranker.get();
   SetCategoryRanker(std::move(mock_ranker));
   std::string json_str =
       MultiCategoryJsonBuilder()
@@ skipping 1124 matching lines @@
                          RemoteSuggestionsProvider::ProviderStatus)>::Call,
                      base::Unretained(&status_callback))));
 
   // Should be called when becoming disabled.
   EXPECT_CALL(status_callback,
               Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE));
   service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED);
 }
 
 }  // namespace ntp_snippets