Componentize kExperimentLabelSeparator & BuildExperimentDateString.

components/variations/variations_experiment_util.h

 // 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.
 
-#ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_EXPERIMENT_UTIL_H_
-#define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_EXPERIMENT_UTIL_H_
+#ifndef COMPONENTS_VARIATIONS_VARIATIONS_EXPERIMENT_UTIL_H_
+#define COMPONENTS_VARIATIONS_VARIATIONS_EXPERIMENT_UTIL_H_
 
 #include "base/strings/string16.h"
 
 namespace base {
 class Time;
 }
 
-namespace google_update {
+namespace variations {
 
 #if defined(OS_WIN)
 // The name of the value where Google Update reads the list of experiments for
 // itself and Chrome.
 extern const wchar_t kExperimentLabels[];

[Alexei Svitkine (slow), 2015/08/13 15:18:29]

Hmm, this doesn't seem to be used anywhere in variations code.

Perhaps move this to google_update_settings.cc/h?

[sdefresne, 2015/08/13 16:46:49]

Ah sorry, you reviewed one of my test patchset to try to understand compilation
failure on Windows. I think I do understand why it is failing now, and this is
because google_update_experiment_util.h now only contains a single symbol which
is not directly used in the dynamic library that export it, and then later the
code linking against the library does not find the symbol.

I agree that this should not be here. Moved.

 #endif
 
 // The separator used to separate items in kExperimentLabels.
 extern const base::char16 kExperimentLabelSeparator;
 
-}  // namespace google_update
-
-namespace installer {
-
 // Constructs a date string in the format understood by Google Update for the
 // |current_time| plus one year.
 base::string16 BuildExperimentDateString(const base::Time& current_time);
 
-}  // namespace installer
+}  // namespace variations
 
-#endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_EXPERIMENT_UTIL_H_
+#endif  // COMPONENTS_VARIATIONS_VARIATIONS_EXPERIMENT_UTIL_H_