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

chrome/common/metrics/variations/experiment_labels_win.h

Index: chrome/common/metrics/variations/experiment_labels_win.h
diff --git a/chrome/common/metrics/variations/variations_util.h b/chrome/common/metrics/variations/experiment_labels_win.h
similarity index 41%
copy from chrome/common/metrics/variations/variations_util.h
copy to chrome/common/metrics/variations/experiment_labels_win.h
index d32cae7a823f0e013ed825b581760f4129fa8bef..61756179887ffe4243859baddce25fc0af95db6e 100644
--- a/chrome/common/metrics/variations/variations_util.h
+++ b/chrome/common/metrics/variations/experiment_labels_win.h
@@ -1,67 +1,33 @@
-// 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.
-
-#ifndef CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
-#define CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
-
-#include <string>
-#include <vector>
-
-#include "base/metrics/field_trial.h"
-#include "base/strings/string16.h"
-#include "components/variations/variations_associated_data.h"
-
-namespace chrome_variations {
-
-// Fills the supplied vector |name_group_ids| (which must be empty when called)
-// with unique ActiveGroupIds for each Field Trial that has a chosen group.
-// Field Trials for which a group has not been chosen yet are NOT returned in
-// this list.
-void GetFieldTrialActiveGroupIds(std::vector<ActiveGroupId>* name_group_ids);
-
-// Fills the supplied vector |output| (which must be empty when called) with
-// unique string representations of ActiveGroupIds for each Field Trial that
-// has a chosen group. The strings are formatted as "<TrialName>-<GroupName>",
-// with the names as hex strings. Field Trials for which a group has not been
-// chosen yet are NOT returned in this list.
-void GetFieldTrialActiveGroupIdsAsStrings(std::vector<std::string>* output);
-
-// Get the current set of chosen FieldTrial groups (aka variations) and send
-// them to the child process logging module so it can save it for crash dumps.
-void SetChildProcessLoggingVariationList();
-
-// Takes the list of active groups and builds the label for the ones that have
-// Google Update VariationID associated with them. This will return an empty
-// string if there are no such groups.
-string16 BuildGoogleUpdateExperimentLabel(
-    const base::FieldTrial::ActiveGroups& active_groups);
-
-// Creates a final combined experiment labels string with |variation_labels|
-// and |other_labels|, appropriately appending a separator based on their
-// contents. It is assumed that |variation_labels| and |other_labels| do not
-// have leading or trailing separators.
-string16 CombineExperimentLabels(const string16& variation_labels,
-                                 const string16& other_labels);
-
-// Takes the value of experiment_labels from the registry and returns a valid
-// experiment_labels string value containing only the labels that are not
-// associated with Chrome Variations.
-string16 ExtractNonVariationLabels(const string16& labels);
-
-// Expose some functions for testing. These functions just wrap functionality
-// that is implemented above.
-namespace testing {
-
-// Clears all of the mapped associations.
-void ClearAllVariationIDs();
-
-void TestGetFieldTrialActiveGroupIds(
-    const base::FieldTrial::ActiveGroups& active_groups,
-    std::vector<ActiveGroupId>* name_group_ids);
-
-}  // namespace testing
-
-}  // namespace chrome_variations
-
-#endif  // CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_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_COMMON_METRICS_VARIATIONS_EXPERIMENT_LABELS_WIN_H_
+#define CHROME_COMMON_METRICS_VARIATIONS_EXPERIMENT_LABELS_WIN_H_
+
+#include "base/metrics/field_trial.h"
+#include "base/strings/string16.h"
+
+namespace chrome_variations {
+
+// Takes the list of active groups and builds the label for the ones that have
+// Google Update VariationID associated with them. This will return an empty
+// string if there are no such groups.
+string16 BuildGoogleUpdateExperimentLabel(
+    const base::FieldTrial::ActiveGroups& active_groups);
+
+// Creates a final combined experiment labels string with |variation_labels|
+// and |other_labels|, appropriately appending a separator based on their
+// contents. It is assumed that |variation_labels| and |other_labels| do not
+// have leading or trailing separators.
+string16 CombineExperimentLabels(const string16& variation_labels,
+                                 const string16& other_labels);
+
+// Takes the value of experiment_labels from the registry and returns a valid
+// experiment_labels string value containing only the labels that are not
+// associated with Chrome Variations.
+string16 ExtractNonVariationLabels(const string16& labels);
+
+}  // namespace chrome_variations
+
+#endif  // CHROME_COMMON_METRICS_VARIATIONS_EXPERIMENT_LABELS_WIN_H_