Use improved VariationParamsManager to hide details.

components/ntp_snippets/remote/ntp_snippets_fetcher.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/remote/ntp_snippets_fetcher.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <utility>
 
@@ skipping 127 matching lines @@
 
 int Get5xxRetryCount(bool interactive_request) {
   if (interactive_request) {
     return 2;
   }
   return std::max(0, variations::GetVariationParamByFeatureAsInt(
                          ntp_snippets::kArticleSuggestionsFeature,
                          kBackground5xxRetriesName, 0));
 }
 
+bool IsSendingTopLanguagesEnabled() {
+  return IsBooleanParameterEnabled(kSendTopLanguagesName,
+                                   /*default_value=*/false);
+}
+
+bool IsSendingUserClassEnabled() {
+  return IsBooleanParameterEnabled(kSendUserClassName,
+                                   /*default_value=*/false);
+}
+
 bool UsesChromeContentSuggestionsAPI(const GURL& endpoint) {
   if (endpoint == kChromeReaderServer) {
     return false;
   }
 
   if (endpoint != kContentSuggestionsServer &&
       endpoint != kContentSuggestionsStagingServer &&
       endpoint != kContentSuggestionsAlphaServer) {
     LOG(WARNING) << "Unknown value for " << kContentSuggestionsBackend << ": "
                  << "assuming chromecontentsuggestions-style API";
@@ skipping 509 matching lines @@
 
 NTPSnippetsFetcher::RequestBuilder&
 NTPSnippetsFetcher::RequestBuilder::SetUserClassifier(
     const UserClassifier& user_classifier) {
   if (IsSendingUserClassEnabled()) {
     user_class_ = GetUserClassString(user_classifier.GetUserClass());
   }
   return *this;
 }
 
-bool NTPSnippetsFetcher::RequestBuilder::IsSendingTopLanguagesEnabled() const {
-  return IsBooleanParameterEnabled(kSendTopLanguagesName,
-                                   /*default_value=*/false);
-}
-
-bool NTPSnippetsFetcher::RequestBuilder::IsSendingUserClassEnabled() const {
-  return IsBooleanParameterEnabled(kSendUserClassName,
-                                   /*default_value=*/false);
-}
-
 std::string NTPSnippetsFetcher::RequestBuilder::BuildHeaders() const {
   net::HttpRequestHeaders headers;
   headers.SetHeader("Content-Type", "application/json; charset=UTF-8");
   if (!auth_header_.empty()) {
     headers.SetHeader("Authorization", auth_header_);
   }
   // Add X-Client-Data header with experiment IDs from field trials.
   variations::AppendVariationHeaders(url_,
                                      false,  // incognito
                                      false,  // uma_enabled
@@ skipping 413 matching lines @@
   NOTREACHED();
   return false;
 }
 
 bool NTPSnippetsFetcher::NeedsAuthentication() const {
   return (personalization_ == Personalization::kPersonal ||
           personalization_ == Personalization::kBoth);
 }
 
 }  // namespace ntp_snippets