Make GetDismissedSuggestionsForDebugging asynchronous

components/ntp_snippets/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/ntp_snippets_service.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 262 matching lines @@
  public:
   MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
   MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName));
   MOCK_METHOD3(
       StartOrQueueNetworkRequest,
       void(const std::string&,
            const GURL&,
            base::Callback<void(const std::string&, const gfx::Image&)>));
 };
 
+class MockDismissedSuggestionsCallback
+    : public ContentSuggestionsProvider::DismissedSuggestionsCallback {
+ public:
+  MOCK_METHOD2(MockRun,
+               void(Category category,
+                    std::vector<ContentSuggestion>* dismissed_suggestions));
+  void Run(Category category,
+           std::vector<ContentSuggestion> dismissed_suggestions) {
+    MockRun(category, &dismissed_suggestions);
+  }
+};
+
 }  // namespace
 
 class NTPSnippetsServiceTest : public test::NTPSnippetsTestBase {
  public:
   NTPSnippetsServiceTest()
       : fake_url_fetcher_factory_(
             /*default_factory=*/&failing_url_fetcher_factory_),
         test_url_(base::StringPrintf(kTestContentSnippetsServerFormat,
                                      google_apis::GetAPIKey().c_str())) {
     NTPSnippetsService::RegisterProfilePrefs(pref_service()->registry());
@@ skipping 253 matching lines @@
   service()->ClearDismissedSuggestionsForDebugging(articles_category());
   EXPECT_THAT(service()->GetSnippetsForTesting(), IsEmpty());
   LoadFromJSONString(json_str);
   EXPECT_THAT(service()->GetSnippetsForTesting(), SizeIs(1));
 }
 
 TEST_F(NTPSnippetsServiceTest, GetDismissed) {
   LoadFromJSONString(GetTestJson({GetSnippet()}));
 
   service()->DismissSuggestion(MakeUniqueID(kSnippetUrl));
-  std::vector<ContentSuggestion> suggestions =
-      service()->GetDismissedSuggestionsForDebugging(articles_category());
-  EXPECT_EQ(1u, suggestions.size());
-  for (auto& suggestion : suggestions) {
-    EXPECT_EQ(MakeUniqueID(kSnippetUrl), suggestion.id());
-  }
+
+  MockDismissedSuggestionsCallback callback;
+
+  EXPECT_CALL(callback, MockRun(_, _))
+      .WillOnce(
+          Invoke([this](Category category,
+                        std::vector<ContentSuggestion>* dismissed_suggestions) {
+            EXPECT_EQ(1u, dismissed_suggestions->size());
+            for (auto& suggestion : *dismissed_suggestions) {
+              EXPECT_EQ(MakeUniqueID(kSnippetUrl), suggestion.id());
+            }
+          }));
+  service()->GetDismissedSuggestionsForDebugging(
+      articles_category(),
+      base::Bind(&MockDismissedSuggestionsCallback::Run,
+                 base::Unretained(&callback), articles_category()));
+  Mock::VerifyAndClearExpectations(&callback);
 
   // There should be no dismissed snippet after clearing the list.
+  EXPECT_CALL(callback, MockRun(_, _))
+      .WillOnce(
+          Invoke([this](Category category,
+                        std::vector<ContentSuggestion>* dismissed_suggestions) {
+            EXPECT_EQ(0u, dismissed_suggestions->size());
+          }));
   service()->ClearDismissedSuggestionsForDebugging(articles_category());
-  EXPECT_EQ(0u, service()
-                    ->GetDismissedSuggestionsForDebugging(articles_category())
-                    .size());
+  service()->GetDismissedSuggestionsForDebugging(
+      articles_category(),
+      base::Bind(&MockDismissedSuggestionsCallback::Run,
+                 base::Unretained(&callback), articles_category()));
 }
 
 TEST_F(NTPSnippetsServiceTest, CreationTimestampParseFail) {
   std::string json_str(GetTestJson({GetSnippetWithTimes(
       "aaa1448459205",
       NTPSnippet::TimeToJsonString(GetDefaultExpirationTime()))}));
 
   LoadFromJSONString(json_str);
   ASSERT_THAT(service()->GetSnippetsForTesting(), SizeIs(1));
   const NTPSnippet& snippet = *service()->GetSnippetsForTesting().front();
@@ skipping 368 matching lines @@
       MakeUniqueID(kSnippetUrl2),
       base::Bind(&testing::MockFunction<void(const std::string&,
                                               const gfx::Image&)>::Call,
                  base::Unretained(&image_fetched)));
 
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(image.IsEmpty());
 }
 
 }  // namespace ntp_snippets