Extend VariationParamsManager to support feature associations.

chrome/browser/component_updater/sw_reporter_installer_win_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 "chrome/browser/component_updater/sw_reporter_installer_win.h"
 
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/json/json_reader.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/scoped_feature_list.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/safe_browsing/srt_fetcher_win.h"
-#include "components/variations/variations_associated_data.h"
+#include "components/variations/variations_params_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace component_updater {
 
 namespace {
 
 constexpr char kExperimentGroupName[] = "my_test_engine_group";
 
 constexpr char kEngineExperimentGroupSwitch[] = "engine-experiment-group";
@@ skipping 93 matching lines @@
   }
 
   void CreateFeatureWithTag(const std::string& tag) {
     std::map<std::string, std::string> params;
     params["tag"] = tag;
     CreateFeatureWithParams(params);
   }
 
   void CreateFeatureWithParams(
       const std::map<std::string, std::string>& params) {
     constexpr char kFeatureName[] = "ExperimentalSwReporterEngine";

[Alexei Svitkine (slow), 2016/11/24 19:29:40]

Nit: Rename to kFeatureAndTrialName

[jkrcal, 2016/11/25 13:23:37]

Done.

 
     std::map<std::string, std::string> params_with_group = params;
     params_with_group["experiment_group_for_reporting"] = kExperimentGroupName;
 
     // Assign the given variation params to the experiment group until
     // |variations_| goes out of scope when the test exits. This will also
-    // create a FieldTrial for this group.
+    // create a FieldTrial for this group and associate the params with the
+    // feature.
     variations_ = std::make_unique<variations::testing::VariationParamsManager>(
-        kFeatureName, params_with_group);
-
-    // Create a feature list containing only the field trial for this group,
-    // and enable it for the length of the test.
-    base::FieldTrial* trial = base::FieldTrialList::Find(kFeatureName);
-    ASSERT_TRUE(trial);
-    auto feature_list = std::make_unique<base::FeatureList>();
-    feature_list->RegisterFieldTrialOverride(
-        kFeatureName, base::FeatureList::OVERRIDE_ENABLE_FEATURE, trial);
-    scoped_feature_list_.InitWithFeatureList(std::move(feature_list));
+        kFeatureName /*trial_name*/, params_with_group,
+        std::set<std::string>{kFeatureName} /*associated_features*/);
   }
 
   void ExpectAttributesWithTag(const SwReporterInstallerTraits& traits,
                                const std::string& tag) {
     update_client::InstallerAttributes attributes =
         traits.GetInstallerAttributes();
     EXPECT_EQ(1U, attributes.size());
     EXPECT_EQ(tag, attributes["tag"]);
   }
 
@@ skipping 567 matching lines @@
   traits.ComponentReady(
       default_version_, default_path_,
       base::DictionaryValue::From(base::JSONReader::Read(kTestManifest)));
 
   // The SwReporter should not be launched, and an error should be logged.
   EXPECT_TRUE(launched_invocations_.empty());
   histograms_.ExpectUniqueSample(kErrorHistogramName,
                                  SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1);
 }
 }  // namespace component_updater