Support server-provided category names.

components/ntp_snippets/ntp_snippets_fetcher_unittest.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/ntp_snippets_fetcher.h"
 
 #include <map>
 #include <utility>
 
 #include "base/json/json_reader.h"
@@ skipping 48 matching lines @@
 ACTION_P(MovePointeeTo, ptr) {
   *ptr = std::move(*arg0);
 }
 
 MATCHER(HasValue, "") {
   return static_cast<bool>(*arg);
 }
 
 MATCHER(IsEmptyArticleList, "is an empty list of articles") {
   NTPSnippetsFetcher::OptionalSnippets& snippets = *arg;
-  return snippets && snippets->size() == 1 && snippets->begin()->second.empty();
+  return snippets && snippets->size() == 1 &&
+         snippets->begin()->snippets.empty();
 }
 
 MATCHER_P(IsSingleArticle, url, "is a list with the single article %(url)s") {
   NTPSnippetsFetcher::OptionalSnippets& snippets = *arg;
   return snippets && snippets->size() == 1 &&
-         snippets->begin()->second.size() == 1 &&
-         snippets->begin()->second[0]->best_source().url.spec() == url;
+         snippets->begin()->snippets.size() == 1 &&
+         snippets->begin()->snippets[0]->best_source().url.spec() == url;
 }
 
 MATCHER_P(EqualsJSON, json, "equals JSON") {
   std::unique_ptr<base::Value> expected = base::JSONReader::Read(json);
   if (!expected) {
     *result_listener << "INTERNAL ERROR: couldn't parse expected JSON";
     return false;
   }
 
   std::string err_msg;
@@ skipping 459 matching lines @@
       .WillOnce(WithArg<0>(MovePointeeTo(&snippets)));
   snippets_fetcher().FetchSnippetsFromHosts(test_hosts(), test_lang(),
                                             test_excluded(),
                                             /*count=*/1,
                                             /*force_request=*/true);
   FastForwardUntilNoTasksRemain();
 
   ASSERT_TRUE(snippets);
   ASSERT_THAT(snippets->size(), Eq(2u));
   for (const auto& category : *snippets) {
-    const auto& articles = category.second;
-    switch (category.first.id()) {
+    const auto& articles = category.snippets;
+    switch (category.category.id()) {
       case static_cast<int>(KnownCategories::ARTICLES):
         ASSERT_THAT(articles.size(), Eq(1u));
         EXPECT_THAT(articles[0]->best_source().url.spec(),
                     Eq("http://localhost/foobar"));
         break;
       case static_cast<int>(KnownCategories::ARTICLES) + 1:
         ASSERT_THAT(articles.size(), Eq(1u));
         EXPECT_THAT(articles[0]->best_source().url.spec(),
                     Eq("http://localhost/foo2"));
         break;
       default:
-        FAIL() << "unknown category ID " << category.first.id();
+        FAIL() << "unknown category ID " << category.category.id();
     }
   }
 
   EXPECT_THAT(snippets_fetcher().last_status(), Eq("OK"));
   EXPECT_THAT(snippets_fetcher().last_json(), Eq(kJsonStr));
   EXPECT_THAT(histogram_tester().GetAllSamples(
                   "NewTabPage.Snippets.FetchHttpResponseOrErrorCode"),
               ElementsAre(base::Bucket(/*min=*/200, /*count=*/1)));
   EXPECT_THAT(histogram_tester().GetAllSamples("NewTabPage.Snippets.FetchTime"),
               ElementsAre(base::Bucket(/*min=*/kTestJsonParsingLatencyMs,
@@ skipping 225 matching lines @@
   if (snippets) {
     // Matchers above aren't any more precise than this, so this is sufficient
     // for test-failure diagnostics.
     return os << "list with " << snippets->size() << " elements";
   } else {
     return os << "null";
   }
 }
 
 }  // namespace ntp_snippets