Componentize kExperimentLabelSeparator & BuildExperimentDateString.

chrome/installer/gcapi/gcapi_reactivation_test.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "chrome/installer/gcapi/gcapi_omaha_experiment.h"
 #include "chrome/installer/gcapi/gcapi_reactivation.h"
 #include "chrome/installer/gcapi/gcapi_test_registry_overrider.h"
 #include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/google_update_experiment_util.h"
+#include "components/variations/variations_experiment_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::win::RegKey;
 
 class GCAPIReactivationTest : public ::testing::Test {
  protected:
   GCAPIReactivationTest() {}
 
@@ skipping 174 matching lines @@
   EXPECT_TRUE(SetLastRunTime(HKEY_CURRENT_USER,
                              hkcu_last_run.ToInternalValue()));
 
   EXPECT_TRUE(ReactivateChrome(L"GAGA",
                                GCAPI_INVOKED_STANDARD_SHELL,
                                &error));
   EXPECT_EQ(L"GAGA", GetReactivationString(HKEY_CURRENT_USER));
 
   EXPECT_TRUE(HasExperimentLabels(HKEY_CURRENT_USER));
 }