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

trunk/src/chrome/common/variations/experiment_labels.cc

Index: trunk/src/chrome/common/variations/experiment_labels.cc
===================================================================
--- trunk/src/chrome/common/variations/experiment_labels.cc	(revision 285674)
+++ trunk/src/chrome/common/variations/experiment_labels.cc	(working copy)
@@ -24,8 +24,7 @@
 // including a timestamp that is a year in the future from |current_time|. Since
 // multiple headers can be transmitted, |count| is a number that is appended
 // after the label key to differentiate the labels.
-base::string16 CreateSingleExperimentLabel(int count,
-                                           variations::VariationID id,
+base::string16 CreateSingleExperimentLabel(int count, VariationID id,
                                            const base::Time& current_time) {
   // Build the parts separately so they can be validated.
   const base::string16 key =
@@ -53,11 +52,10 @@
   // Find all currently active VariationIDs associated with Google Update.
   for (base::FieldTrial::ActiveGroups::const_iterator it =
        active_groups.begin(); it != active_groups.end(); ++it) {
-    const variations::VariationID id =
-        variations::GetGoogleVariationID(variations::GOOGLE_UPDATE_SERVICE,
-                                         it->trial_name, it->group_name);
+    const VariationID id = GetGoogleVariationID(GOOGLE_UPDATE_SERVICE,
+                                                it->trial_name, it->group_name);
 
-    if (id == variations::EMPTY_ID)
+    if (id == EMPTY_ID)
       continue;
 
     if (!experiment_labels.empty())