NTP: Extract JSON requests from Fetcher.

components/ntp_snippets/remote/remote_suggestions_provider.h

 // 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_PROVIDER_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_PROVIDER_H_
 
 #include <cstddef>
 #include <deque>
 #include <map>
@@ skipping 27 matching lines @@
 class Image;
 }  // namespace gfx
 
 namespace image_fetcher {
 class ImageDecoder;
 class ImageFetcher;
 }  // namespace image_fetcher
 
 namespace ntp_snippets {
 
+struct NTPSnippetsRequestParams;

[tschumann, 2016/12/16 16:36:20]

no need to distinguish struct vs class in forward declarations. (at least IMO).

[fhorschig, 2016/12/20 10:07:38]

Done.

 class RemoteSuggestionsDatabase;
 class UserClassifier;
 
 // CachedImageFetcher takes care of fetching images from the network and caching
 // them in the database.
 // TODO(tschumann): Move into a separate library and inject the
 // CachedImageFetcher into the RemoteSuggestionsProvider. This allows us to get
 // rid of exposing this member for testing and lets us test the caching logic
 // separately.
 class CachedImageFetcher : public image_fetcher::ImageFetcherDelegate {
@@ skipping 328 matching lines @@
 
   // Updates the category info for |category|. If a corresponding
   // CategoryContent object does not exist, it will be created.
   // Returns the existing or newly created object.
   CategoryContent* UpdateCategoryInfo(Category category,
                                       const CategoryInfo& info);
 
   void RestoreCategoriesFromPrefs();
   void StoreCategoriesToPrefs();
 
-  NTPSnippetsFetcher::Params BuildFetchParams() const;
+  NTPSnippetsRequestParams BuildFetchParams() const;
 
   void MarkEmptyCategoriesAsLoading();
 
   State state_;
 
   PrefService* pref_service_;
 
   const Category articles_category_;
 
   std::map<Category, CategoryContent, Category::CompareByID> category_contents_;
@@ skipping 31 matching lines @@
 
   // A clock for getting the time. This allows to inject a clock in tests.
   std::unique_ptr<base::Clock> clock_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteSuggestionsProvider);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_PROVIDER_H_