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

components/variations/fieldtrial_util_unittest.cc

Index: components/variations/fieldtrial_util_unittest.cc
diff --git a/chrome/common/variations/variations_util_unittest.cc b/components/variations/fieldtrial_util_unittest.cc
similarity index 91%
rename from chrome/common/variations/variations_util_unittest.cc
rename to components/variations/fieldtrial_util_unittest.cc
index 6c029b7fe0201f45f35d7a512210eb0ce0809cd4..99b0bc64aec4e4d59c469a22b28b4930565da75d 100644
--- a/chrome/common/variations/variations_util_unittest.cc
+++ b/components/variations/fieldtrial_util_unittest.cc
@@ -2,7 +2,7 @@
 // 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>
@@ -11,17 +11,17 @@
 #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();
@@ -31,10 +31,10 @@ class VariationsUtilTest : public ::testing::Test {
  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";
@@ -51,14 +51,14 @@ TEST_F(VariationsUtilTest, AssociateParamsFromString) {
   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[] = {
@@ -97,7 +97,7 @@ TEST_F(VariationsUtilTest, AssociateParamsFromFieldTrialConfig) {
   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};
@@ -141,7 +141,7 @@ TEST_F(VariationsUtilTest, AssociateFeaturesFromFieldTrialConfig) {
   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}
   };