Revert 285657 "Move variations component code to variations name..."

trunk/src/components/variations/variations_associated_data_unittest.cc

 // Copyright 2013 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/variations/variations_associated_data.h"
 
 #include "base/metrics/field_trial.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace variations {
+namespace chrome_variations {
 
 namespace {
 
 const VariationID TEST_VALUE_A = 3300200;
 const VariationID TEST_VALUE_B = 3300201;
 
-// Convenience helper to retrieve the variations::VariationID for a FieldTrial.
-// Note that this will do the group assignment in |trial| if not already done.
+// Convenience helper to retrieve the chrome_variations::VariationID for a
+// FieldTrial. Note that this will do the group assignment in |trial| if not
+// already done.
 VariationID GetIDForTrial(IDCollectionKey key, base::FieldTrial* trial) {
   return GetGoogleVariationID(key, trial->trial_name(), trial->group_name());
 }
 
 // Tests whether a field trial is active (i.e. group() has been called on it).
 bool IsFieldTrialActive(const std::string& trial_name) {
   base::FieldTrial::ActiveGroups active_groups;
   base::FieldTrialList::GetActiveFieldTrialGroups(&active_groups);
   for (size_t i = 0; i < active_groups.size(); ++i) {
     if (active_groups[i].trial_name == trial_name)
@@ skipping 292 matching lines @@
   ASSERT_FALSE(IsFieldTrialActive(kTrialName));
   scoped_refptr<base::FieldTrial> trial(
       CreateFieldTrial(kTrialName, 100, "A", NULL));
   ASSERT_FALSE(IsFieldTrialActive(kTrialName));
 
   std::map<std::string, std::string> params;
   EXPECT_EQ(std::string(), GetVariationParamValue(kTrialName, "x"));
   ASSERT_TRUE(IsFieldTrialActive(kTrialName));
 }
 
-}  // namespace variations
+}  // namespace chrome_variations