GCAPI should append to the existing experiment_labels instead of clobbering them.

chrome/installer/util/google_update_constants.h

 // 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.
 
 // Defines all the command-line switches used with Google Update.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_CONSTANTS_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_CONSTANTS_H_
 
+#include "base/string16.h"

[Alexei Svitkine (slow), 2013/08/30 14:17:19]

I think this is "base/strings/string16.h" now.

[gab, 2013/08/30 17:53:11]

Right, my bad, done.

+
 namespace google_update {
 
 // The GUID Google Update uses to keep track of Chrome upgrades.
 extern const wchar_t kChromeUpgradeCode[];
 
 // The name of the value where Google Update reads the list of experiments for
 // itself and Chrome.
-extern const wchar_t kExperimentLabels[];
+extern const char16 kExperimentLabels[];
+
+// The separator used to separate items in kExperimentLabels.
+extern const wchar_t kExperimentLabelSep[];
 
 // The GUID Google Update uses to keep track of Google Update self-upgrades.
 extern const wchar_t kGoogleUpdateUpgradeCode[];
 
 extern const wchar_t kGoogleUpdateSetupExe[];
 
 extern const wchar_t kRegPathClients[];
 
 // The difference between ClientState and ClientStateMedium is that the former
 // lives on HKCU or HKLM and the later always lives in HKLM. ClientStateMedium
@@ skipping 46 matching lines @@
 extern const wchar_t kRegUsageStatsField[];
 extern const wchar_t kRegVersionField[];
 extern const wchar_t kRegWebAccessibleField[];
 
 // last time that chrome ran in the Time internal format.
 extern const wchar_t kRegLastRunTimeField[];
 
 }  // namespace google_update
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_UPDATE_CONSTANTS_H_