Move Field Trial Utils from chrome/common/variations to components/variations/field_trial_util

components/variations/fieldtrial_util_unittest.cc

 // 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.
 
-#include "chrome/common/variations/variations_util.h"
+#include "components/variations/fieldtrial_util.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
-#include "chrome/common/variations/fieldtrial_testing_config.h"
+#include "components/variations/fieldtrial_testing_config.h"
 #include "components/variations/variations_associated_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace chrome_variations {
+namespace variations {
 
-class VariationsUtilTest : public ::testing::Test {
+class FieldtrialUtilTest : public ::testing::Test {

[Alexei Svitkine (slow), 2016/10/31 17:22:38]

Nit: FieldTrialUtilTest and name the file field_trial_util to match e.g.
base/metrics/field_trial.cc.

Also, I'm not a big fan of the util name. If this is specific to field trial
config, how about field_trial_config_util.cc?

[robliao, 2016/10/31 17:26:25]

Works for me. I was just going off of the fieldtrial_testing_config pattern.
Will do after we resolve the location.

[robliao, 2016/11/02 00:00:28]

Done.

  public:
-  VariationsUtilTest() : field_trial_list_(nullptr) {}
+  FieldtrialUtilTest() : field_trial_list_(nullptr) {}
 
-  ~VariationsUtilTest() override {
+  ~FieldtrialUtilTest() override {
     // Ensure that the maps are cleared between tests, since they are stored as
     // process singletons.
     variations::testing::ClearAllVariationIDs();
     variations::testing::ClearAllVariationParams();
   }
 
  private:
   base::FieldTrialList field_trial_list_;
 
-  DISALLOW_COPY_AND_ASSIGN(VariationsUtilTest);
+  DISALLOW_COPY_AND_ASSIGN(FieldtrialUtilTest);
 };
 
-TEST_F(VariationsUtilTest, AssociateParamsFromString) {
+TEST_F(FieldtrialUtilTest, AssociateParamsFromString) {
   const std::string kTrialName = "AssociateVariationParams";
   const std::string kVariationsString =
       "AssociateVariationParams.A:a/10/b/test,AssociateVariationParams.B:a/%2F";
   ASSERT_TRUE(AssociateParamsFromString(kVariationsString));
 
   base::FieldTrialList::CreateFieldTrial(kTrialName, "B");
   EXPECT_EQ("/", variations::GetVariationParamValue(kTrialName, "a"));
   EXPECT_EQ(std::string(), variations::GetVariationParamValue(kTrialName, "b"));
   EXPECT_EQ(std::string(), variations::GetVariationParamValue(kTrialName, "x"));
 
   std::map<std::string, std::string> params;
   EXPECT_TRUE(variations::GetVariationParams(kTrialName, &params));
   EXPECT_EQ(1U, params.size());
   EXPECT_EQ("/", params["a"]);
 }
 
-TEST_F(VariationsUtilTest, AssociateParamsFromStringWithSameTrial) {
+TEST_F(FieldtrialUtilTest, AssociateParamsFromStringWithSameTrial) {
   const std::string kTrialName = "AssociateVariationParams";
   const std::string kVariationsString =
       "AssociateVariationParams.A:a/10/b/test,AssociateVariationParams.A:a/x";
   ASSERT_FALSE(AssociateParamsFromString(kVariationsString));
 }
 
-TEST_F(VariationsUtilTest, AssociateParamsFromFieldTrialConfig) {
+TEST_F(FieldtrialUtilTest, AssociateParamsFromFieldTrialConfig) {
   const FieldTrialTestingExperimentParams array_kFieldTrialConfig_params_0[] =
       {{"x", "1"}, {"y", "2"}};
   const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
       {"TestGroup1", array_kFieldTrialConfig_params_0, 2, nullptr, 0,
        nullptr, 0, nullptr},
   };
   const FieldTrialTestingExperimentParams array_kFieldTrialConfig_params_1[] =
       {{"x", "3"}, {"y", "4"}};
   const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
       {"TestGroup2", array_kFieldTrialConfig_params_0, 2, nullptr, 0,
@@ skipping 18 matching lines @@
   std::map<std::string, std::string> params;
   EXPECT_TRUE(variations::GetVariationParams("TestTrial1", &params));
   EXPECT_EQ(2U, params.size());
   EXPECT_EQ("1", params["x"]);
   EXPECT_EQ("2", params["y"]);
 
   EXPECT_EQ("TestGroup1", base::FieldTrialList::FindFullName("TestTrial1"));
   EXPECT_EQ("TestGroup2", base::FieldTrialList::FindFullName("TestTrial2"));
 }
 
-TEST_F(VariationsUtilTest, AssociateFeaturesFromFieldTrialConfig) {
+TEST_F(FieldtrialUtilTest, AssociateFeaturesFromFieldTrialConfig) {
   const base::Feature kFeatureA{"A", base::FEATURE_DISABLED_BY_DEFAULT};
   const base::Feature kFeatureB{"B", base::FEATURE_ENABLED_BY_DEFAULT};
   const base::Feature kFeatureC{"C", base::FEATURE_DISABLED_BY_DEFAULT};
   const base::Feature kFeatureD{"D", base::FEATURE_ENABLED_BY_DEFAULT};
 
   const char* enable_features[] = {"A", "B"};
   const char* disable_features[] = {"C", "D"};
 
   const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
       {"TestGroup1", nullptr, 0, enable_features, 2, nullptr, 0, nullptr},
@@ skipping 23 matching lines @@
   EXPECT_TRUE(base::FeatureList::IsEnabled(kFeatureA));
   EXPECT_TRUE(base::FeatureList::IsEnabled(kFeatureB));
   EXPECT_TRUE(base::FieldTrialList::IsTrialActive("TestTrial1"));
 
   EXPECT_FALSE(base::FieldTrialList::IsTrialActive("TestTrial2"));
   EXPECT_FALSE(base::FeatureList::IsEnabled(kFeatureC));
   EXPECT_FALSE(base::FeatureList::IsEnabled(kFeatureD));
   EXPECT_TRUE(base::FieldTrialList::IsTrialActive("TestTrial2"));
 }
 
-TEST_F(VariationsUtilTest, AssociateForcingFlagsFromFieldTrialConfig) {
+TEST_F(FieldtrialUtilTest, AssociateForcingFlagsFromFieldTrialConfig) {
   const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_0[] = {
       {"TestGroup1", nullptr, 0, nullptr, 0, nullptr, 0, nullptr}
   };
   const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_1[] = {
       {"TestGroup2", nullptr, 0, nullptr, 0, nullptr, 0, nullptr},
       {"ForcedGroup2", nullptr, 0, nullptr, 0, nullptr, 0, "flag-2"},
   };
   const FieldTrialTestingExperiment array_kFieldTrialConfig_experiments_2[] = {
       {"TestGroup3", nullptr, 0, nullptr, 0, nullptr, 0, nullptr},
       {"ForcedGroup3", nullptr, 0, nullptr, 0, nullptr, 0, "flag-3"},
@@ skipping 13 matching lines @@
 
   base::FeatureList feature_list;
   AssociateParamsFromFieldTrialConfig(kConfig, &feature_list);
 
   EXPECT_EQ("TestGroup1", base::FieldTrialList::FindFullName("TestTrial1"));
   EXPECT_EQ("ForcedGroup2", base::FieldTrialList::FindFullName("TestTrial2"));
   EXPECT_EQ("ForcedGroup3", base::FieldTrialList::FindFullName("TestTrial3"));
 }
 
 }  // namespace chrome_variations