Componentize kExperimentLabelSeparator & BuildExperimentDateString.

chrome/installer/gcapi/gcapi_omaha_experiment.cc

Index: chrome/installer/gcapi/gcapi_omaha_experiment.cc
diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment.cc b/chrome/installer/gcapi/gcapi_omaha_experiment.cc
index 1724b971d4a4d9804368a4ac2b68836127f8078f..6e004344ca784059e4289510cc522f47a8e38ab0 100644
--- a/chrome/installer/gcapi/gcapi_omaha_experiment.cc
+++ b/chrome/installer/gcapi/gcapi_omaha_experiment.cc
@@ -12,8 +12,8 @@
 #include "base/time/time.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/google_update_experiment_util.h"
 #include "chrome/installer/util/google_update_settings.h"
+#include "components/variations/variations_experiment_util.h"
 
 namespace {
 
@@ -44,7 +44,7 @@ bool SetExperimentLabel(const wchar_t* brand_code,
   // Split the original labels by the label separator.
   std::vector<base::string16> entries = base::SplitString(
       original_labels,
-      base::string16(1, google_update::kExperimentLabelSeparator),
+      base::string16(1, variations::kExperimentLabelSeparator),
       base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // Keep all labels, but the one we want to add/replace.
@@ -56,7 +56,7 @@ bool SetExperimentLabel(const wchar_t* brand_code,
         !base::StartsWith(entry, label_and_separator,
                           base::CompareCase::SENSITIVE)) {
       new_labels += entry;
-      new_labels += google_update::kExperimentLabelSeparator;
+      new_labels += variations::kExperimentLabelSeparator;
     }
   }
 
@@ -91,7 +91,7 @@ base::string16 GetGCAPIExperimentLabel(const wchar_t* brand_code,
                       label.c_str(),
                       brand_code,
                       GetCurrentRlzWeek(instance_time),
-                      installer::BuildExperimentDateString(
+                      variations::BuildExperimentDateString(
                           instance_time).c_str());
   return gcapi_experiment_label;
 }