Finalize backend for fetching more NTPSnippets.

components/ntp_snippets/remote/ntp_snippets_service_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/ntp_snippets_service.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 485 matching lines @@
                                               net::URLRequestStatus::SUCCESS);
   }
 
   void LoadFromJSONString(NTPSnippetsService* service,
                           const std::string& json) {
     SetUpFetchResponse(json);
     service->FetchSnippets(true);
     base::RunLoop().RunUntilIdle();
   }
 
-  void LoadMoreFromJSONString(
-      NTPSnippetsService* service,
-      const std::string& json,
-      NTPSnippetsService::FetchedMoreCallback callback) {
+  void LoadMoreFromJSONString(NTPSnippetsService* service,
+                              const std::string& json,
+                              std::set<std::string> known,

[dgn, 2016/11/02 11:10:11]

|known_ids| maybe? name is too unspecific as it is now.

[fhorschig, 2016/11/03 01:53:14]

Done.

+                              NTPSnippetsService::FetchingCallback callback) {
     SetUpFetchResponse(json);
-    service->FetchMore(articles_category(), callback);
+    service->Fetch(articles_category(), known, callback);
     base::RunLoop().RunUntilIdle();
   }
 
  private:
   variations::testing::VariationParamsManager params_manager_;
   test::NTPSnippetsTestUtils utils_;
   base::MessageLoop message_loop_;
   FailingFakeURLFetcherFactory failing_url_fetcher_factory_;
   // Instantiation of factory automatically sets itself as URLFetcher's factory.
   net::FakeURLFetcherFactory fake_url_fetcher_factory_;
@@ skipping 323 matching lines @@
   auto service = MakeSnippetsService();
 
   std::string first("http://first");
   LoadFromJSONString(service.get(), GetTestJson({GetSnippetWithUrl(first)}));
   EXPECT_THAT(service->GetSnippetsForTesting(articles_category()),
               ElementsAre(IdEq(first)));
 
   std::string second("http://second");
   LoadMoreFromJSONString(service.get(),
                          GetTestJson({GetSnippetWithUrl(second)}),
+                         std::set<std::string>(),
                          base::Bind([](std::vector<ContentSuggestion>) {}));
   // The snippets loaded last are added to the previously loaded.
   EXPECT_THAT(service->GetSnippetsForTesting(articles_category()),
               ElementsAre(IdEq(first), IdEq(second)));
 }
 
 namespace {
 
 // Workaround for gMock's lack of support for movable types.
 void SuggestionsLoaded(
     MockFunction<void(const std::vector<ContentSuggestion>& v)>* loaded,
     std::vector<ContentSuggestion> v) {
   loaded->Call(v);
 }
 
 }  // namespace
 
 TEST_F(NTPSnippetsServiceTest, InvokesOnlyCallbackOnFetchingMore) {
   auto service = MakeSnippetsService();
 
   MockFunction<void(const std::vector<ContentSuggestion>&)> loaded;
   EXPECT_CALL(loaded, Call(SizeIs(1)));
 
-  LoadMoreFromJSONString(service.get(),
-                         GetTestJson({GetSnippetWithUrl("http://some")}),
-                         base::Bind(&SuggestionsLoaded, &loaded));
+  LoadMoreFromJSONString(
+      service.get(), GetTestJson({GetSnippetWithUrl("http://some")}),
+      std::set<std::string>(), base::Bind(&SuggestionsLoaded, &loaded));
 
   // The observer shouldn't have been triggered.
   EXPECT_THAT(observer().SuggestionsForCategory(articles_category()),
               IsEmpty());
 }
 
+TEST_F(NTPSnippetsServiceTest, ReturnFetchRequestEmptyBeforeInit) {
+  auto service = MakeSnippetsServiceWithoutInitialization();
+  MockFunction<void(const std::vector<ContentSuggestion>&)> loaded;
+  EXPECT_CALL(loaded, Call(SizeIs(0)));
+  service->Fetch(articles_category(), std::set<std::string>(),
+                 base::Bind(&SuggestionsLoaded, &loaded));
+  base::RunLoop().RunUntilIdle();
+}
+
 TEST_F(NTPSnippetsServiceTest, LoadInvalidJson) {
   auto service = MakeSnippetsService();
 
   LoadFromJSONString(service.get(), GetTestJson({GetInvalidSnippet()}));
   EXPECT_THAT(service->snippets_fetcher()->last_status(),
               StartsWith("Received invalid JSON"));
   EXPECT_THAT(service->GetSnippetsForTesting(articles_category()), IsEmpty());
 }
 
 TEST_F(NTPSnippetsServiceTest, LoadInvalidJsonWithExistingSnippets) {
@@ skipping 451 matching lines @@
         base::StringPrintf("http://localhost/snippet-id-%d", i)));
   }
   LoadFromJSONString(service.get(), GetTestJson(suggestions));
   // TODO(tschumann): We should probably trim out any additional results and
   // only serve the MaxSnippetCount items.
   EXPECT_THAT(service->GetSnippetsForTesting(articles_category()),
               SizeIs(service->GetMaxSnippetCountForTesting() + 1));
 }
 
 }  // namespace ntp_snippets