Use improved VariationParamsManager to hide details.

Resolved a TODO: The testing::variations::VariationParamsManager
replaces a mock.

In order to enable Feature-associated params, the tested RequestBuilder
needed to be mocked. Since CL 645447, Feature-association works now and
exposing implementation details and mocking is now unnecessary.

BUG=634892

Review-Url: https://codereview.chromium.org/2552813005
Cr-Commit-Position: refs/heads/master@{#438122}

components/ntp_snippets/remote/ntp_snippets_fetcher.cc

@@ -145,6 +145,16 @@ int Get5xxRetryCount(bool interactive_request) {
                          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;
@@ -674,16 +684,6 @@ NTPSnippetsFetcher::RequestBuilder::SetUserClassifier(
   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");

components/ntp_snippets/remote/ntp_snippets_fetcher.h

@@ -173,17 +173,21 @@ class NTPSnippetsFetcher : public OAuth2TokenService::Consumer,
   }
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestAuthenticated);
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestUnauthenticated);
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestExcludedIds);
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest, BuildRequestNoUserClass);
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
+                           BuildRequestAuthenticated);
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
+                           BuildRequestUnauthenticated);
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
+                           BuildRequestExcludedIds);
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
+                           BuildRequestNoUserClass);
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
                            BuildRequestWithTwoLanguages);
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
                            BuildRequestWithUILanguageOnly);
-  FRIEND_TEST_ALL_PREFIXES(NTPSnippetsFetcherTest,
+  FRIEND_TEST_ALL_PREFIXES(ChromeReaderSnippetsFetcherTest,
                            BuildRequestWithOtherLanguageOnly);
-  friend class NTPSnippetsFetcherTest;
+  friend class ChromeReaderSnippetsFetcherTest;
 
   enum FetchAPI {
     CHROME_READER_API,
@@ -235,12 +239,6 @@ class NTPSnippetsFetcher : public OAuth2TokenService::Consumer,
       return *this;
     }
 
-   protected:
-    // TODO(fhorschig): As soon as crbug.com/crbug.com/645447 is resolved,
-    // make these an implementation detail in the body and remove the mock.
-    virtual bool IsSendingTopLanguagesEnabled() const;
-    virtual bool IsSendingUserClassEnabled() const;
-
    private:
     std::string BuildHeaders() const;
     std::string BuildBody() const;