Support server-provided category names.

components/ntp_snippets/ntp_snippets_fetcher.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_FETCHER_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_FETCHER_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 29 matching lines @@
                            public OAuth2TokenService::Observer,
                            public net::URLFetcherDelegate {
  public:
   // Callbacks for JSON parsing, needed because the parsing is platform-
   // dependent.
   using SuccessCallback = base::Callback<void(std::unique_ptr<base::Value>)>;
   using ErrorCallback = base::Callback<void(const std::string&)>;
   using ParseJSONCallback = base::Callback<
       void(const std::string&, const SuccessCallback&, const ErrorCallback&)>;
 
-  using OptionalSnippets = base::Optional<NTPSnippet::CategoryMap>;
+  struct FetchedCategory {
+    Category category;
+    base::string16 localized_title;  // Ignored for non-server categories.
+    NTPSnippet::PtrVector snippets;
+
+    FetchedCategory(Category c);
+    FetchedCategory(FetchedCategory&&);             // = default, in .cc
+    ~FetchedCategory();                             // = default, in .cc
+    FetchedCategory& operator=(FetchedCategory&&);  // = default, in .cc
+  };
+  using FetchedCategoriesVector = std::vector<FetchedCategory>;
+  using OptionalSnippets = base::Optional<FetchedCategoriesVector>;
+
   // |snippets| contains parsed snippets if a fetch succeeded. If problems
   // occur, |snippets| contains no value (no actual vector in base::Optional).
   // Error details can be retrieved using last_status().
   using SnippetsAvailableCallback =
       base::Callback<void(OptionalSnippets snippets)>;
 
   // Enumeration listing all possible outcomes for fetch attempts. Used for UMA
   // histograms, so do not change existing values. Insert new values at the end,
   // and update the histogram definition.
   enum class FetchResult {
@@ skipping 115 matching lines @@
   void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                          const GoogleServiceAuthError& error) override;
 
   // OAuth2TokenService::Observer overrides:
   void OnRefreshTokenAvailable(const std::string& account_id) override;
 
   // URLFetcherDelegate implementation.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   bool JsonToSnippets(const base::Value& parsed,
-                      NTPSnippet::CategoryMap* snippets);
+                      FetchedCategoriesVector* categories);
   void OnJsonParsed(std::unique_ptr<base::Value> parsed);
   void OnJsonError(const std::string& error);
   void FetchFinished(OptionalSnippets snippets,
                      FetchResult result,
                      const std::string& extra_message);
 
   // Authorization for signed-in users.
   SigninManagerBase* signin_manager_;
   OAuth2TokenService* token_service_;
   std::unique_ptr<OAuth2TokenService::Request> oauth_request_;
@@ skipping 48 matching lines @@
   // When a token request gets canceled, we want to retry once.
   bool oauth_token_retried_;
 
   base::WeakPtrFactory<NTPSnippetsFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsFetcher);
 };
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_FETCHER_H_