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>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "components/image_fetcher/image_fetcher_delegate.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/category_status.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #include "components/ntp_snippets/content_suggestions_provider.h"
 #include "components/ntp_snippets/remote/ntp_snippet.h"
 #include "components/ntp_snippets/remote/ntp_snippets_fetcher.h"
+#include "components/ntp_snippets/remote/ntp_snippets_request_params.h"
 #include "components/ntp_snippets/remote/ntp_snippets_scheduler.h"
 #include "components/ntp_snippets/remote/remote_suggestions_status_service.h"
 #include "components/ntp_snippets/remote/request_throttler.h"
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace gfx {
 class Image;
 }  // namespace gfx
@@ skipping 102 matching lines @@
   // Fetchs content suggestions from the Content Suggestions server for all
   // remote categories in the background.
   void FetchSnippetsInTheBackground();
 
   // Fetchs content suggestions from the Content Suggestions server for all
   // remote categories. The request to the server is performed as an interactive
   // request. Interactive requests are used for actions triggered by the user
   // and request lower latency processing.
   void FetchSnippetsForAllCategories();
 
+  // Only used in tests and for debugging in snippets-internal/.
+  // TODO(fhorschig): Remove this getter when there is an interface for the
+  // fetcher that allows better mocks.
   const NTPSnippetsFetcher* snippets_fetcher() const {
     return snippets_fetcher_.get();
   }
 
   // (Re)schedules the periodic fetching of snippets. If |force| is true, the
   // tasks will be re-scheduled even if they already exist and have the correct
   // periods.
   void RescheduleFetching(bool force);
 
   // ContentSuggestionsProvider implementation
@@ skipping 225 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 34 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_