NTP: VariationParamsManager resetting works, so make it a member.

components/ntp_snippets/remote/ntp_snippets_fetcher_unittest.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 <deque>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 254 matching lines @@
       base::TimeDelta::FromMilliseconds(kTestJsonParsingLatencyMs));
 }
 
 }  // namespace
 
 class NTPSnippetsFetcherTestBase : public testing::Test {
  public:
   explicit NTPSnippetsFetcherTestBase(const GURL& gurl)
       : default_variation_params_(
             {{"send_top_languages", "true"}, {"send_user_class", "true"}}),
-        params_manager_(
-            base::MakeUnique<variations::testing::VariationParamsManager>(
-                ntp_snippets::kStudyName,
-                default_variation_params_,
-                std::set<std::string>{
-                    ntp_snippets::kArticleSuggestionsFeature.name})),
+        params_manager_(ntp_snippets::kStudyName,
+                        default_variation_params_,
+                        {ntp_snippets::kArticleSuggestionsFeature.name}),
         mock_task_runner_(new base::TestMockTimeTaskRunner()),
         mock_task_runner_handle_(mock_task_runner_),
         signin_client_(base::MakeUnique<TestSigninClient>(nullptr)),
         account_tracker_(base::MakeUnique<AccountTrackerService>()),
         fake_signin_manager_(
             base::MakeUnique<FakeSigninManagerBase>(signin_client_.get(),
                                                     account_tracker_.get())),
         fake_token_service_(base::MakeUnique<FakeProfileOAuth2TokenService>()),
         pref_service_(base::MakeUnique<TestingPrefServiceSimple>()),
         test_url_(gurl) {
@@ skipping 40 matching lines @@
   void InitFakeURLFetcherFactory() {
     if (fake_url_fetcher_factory_) {
       return;
     }
     // Instantiation of factory automatically sets itself as URLFetcher's
     // factory.
     fake_url_fetcher_factory_.reset(new net::FakeURLFetcherFactory(
         /*default_factory=*/&failing_url_fetcher_factory_));
   }
 
-  void SetDefaultVariationParam(std::string param_name, std::string value) {
-    default_variation_params_[param_name] = value;
-    SetVariationParam(param_name, value);
-  }
-
   void SetVariationParam(std::string param_name, std::string value) {
-    params_manager_.reset();
-
     std::map<std::string, std::string> params = default_variation_params_;
     params[param_name] = value;
 
-    params_manager_ =
-        base::MakeUnique<variations::testing::VariationParamsManager>(
-            ntp_snippets::kStudyName, params,
-            std::set<std::string>{
-                ntp_snippets::kArticleSuggestionsFeature.name});
-  }
-
-  void SetVariationParametersForFeatures(
-      const std::map<std::string, std::string>& params,
-      const std::set<std::string>& features) {
-    params_manager_.reset();
-    params_manager_ =
-        base::MakeUnique<variations::testing::VariationParamsManager>(
-            ntp_snippets::kStudyName, params, features);
+    params_manager_.ClearAllVariationParams();
+    params_manager_.SetVariationParamsWithFeatureAssociations(
+        ntp_snippets::kStudyName, params,
+        {ntp_snippets::kArticleSuggestionsFeature.name});
   }
 
   void SetFakeResponse(const std::string& response_data,
                        net::HttpStatusCode response_code,
                        net::URLRequestStatus::Status status) {
     InitFakeURLFetcherFactory();
     fake_url_fetcher_factory_->SetFakeResponse(test_url_, response_data,
                                                response_code, status);
   }
 
   TestingPrefServiceSimple* pref_service() const { return pref_service_.get(); }
 
+ protected:
+  std::map<std::string, std::string> default_variation_params_;
+
  private:
-  std::map<std::string, std::string> default_variation_params_;
-  // TODO(fhorschig): Make it a simple member when crbug.com/672010 is resolved.
-  std::unique_ptr<variations::testing::VariationParamsManager> params_manager_;
+  variations::testing::VariationParamsManager params_manager_;
   scoped_refptr<base::TestMockTimeTaskRunner> mock_task_runner_;
   base::ThreadTaskRunnerHandle mock_task_runner_handle_;
   FailingFakeURLFetcherFactory failing_url_fetcher_factory_;
   // Initialized lazily in SetFakeResponse().
   std::unique_ptr<net::FakeURLFetcherFactory> fake_url_fetcher_factory_;
   std::unique_ptr<TestSigninClient> signin_client_;
   std::unique_ptr<AccountTrackerService> account_tracker_;
   std::unique_ptr<SigninManagerBase> fake_signin_manager_;
   std::unique_ptr<OAuth2TokenService> fake_token_service_;
   std::unique_ptr<NTPSnippetsFetcher> snippets_fetcher_;
@@ skipping 10 matching lines @@
  public:
   ChromeReaderSnippetsFetcherTest()
       : NTPSnippetsFetcherTestBase(GURL(kTestChromeReaderUrl)) {}
 };
 
 class NTPSnippetsContentSuggestionsFetcherTest
     : public NTPSnippetsFetcherTestBase {
  public:
   NTPSnippetsContentSuggestionsFetcherTest()
       : NTPSnippetsFetcherTestBase(GURL(kTestChromeContentSuggestionsUrl)) {
-    SetDefaultVariationParam("content_suggestions_backend",
-                             kContentSuggestionsServer);
+    default_variation_params_["content_suggestions_backend"] =
+        kContentSuggestionsServer;
+    SetVariationParam("content_suggestions_backend", kContentSuggestionsServer);
     ResetSnippetsFetcher();
   }
 };
 
 TEST_F(ChromeReaderSnippetsFetcherTest, ShouldNotFetchOnCreation) {
   // The lack of registered baked in responses would cause any fetch to fail.
   FastForwardUntilNoTasksRemain();
   EXPECT_THAT(histogram_tester().GetAllSamples(
                   "NewTabPage.Snippets.FetchHttpResponseOrErrorCode"),
               IsEmpty());
@@ skipping 336 matching lines @@
       {"", 0, "Do not retry by default"},
       {"0", 0, "Do not retry on param value 0"},
       {"-1", 0, "Do not retry on negative param values."},
       {"4", 4, "Retry as set in param value."}};
 
   NTPSnippetsRequestParams params = test_params();
   params.interactive_request = false;
 
   for (const auto& retry_config : retry_config_expectation) {
     DelegateCallingTestURLFetcherFactory fetcher_factory;
-    SetVariationParametersForFeatures(
-        {{"background_5xx_retries_count", retry_config.param_value}},
-        {ntp_snippets::kArticleSuggestionsFeature.name});
+    SetVariationParam("background_5xx_retries_count", retry_config.param_value);
 
     snippets_fetcher().FetchSnippets(
         params, ToSnippetsAvailableCallback(&mock_callback()));
 
     net::TestURLFetcher* fetcher = fetcher_factory.GetLastCreatedFetcher();
     ASSERT_THAT(fetcher, NotNull());
     EXPECT_THAT(fetcher->GetMaxRetriesOn5xx(), Eq(retry_config.expected_value))
         << retry_config.description;
   }
 }
@@ skipping 151 matching lines @@
     const NTPSnippetsFetcher::OptionalFetchedCategories& fetched_categories) {
   if (fetched_categories) {
     // Matchers above aren't any more precise than this, so this is sufficient
     // for test-failure diagnostics.
     return os << "list with " << fetched_categories->size() << " elements";
   }
   return os << "null";
 }
 
 }  // namespace ntp_snippets