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

chrome/common/metrics/variations/variations_util_unittest.cc

Index: chrome/common/metrics/variations/variations_util_unittest.cc
diff --git a/chrome/common/metrics/variations/variations_util_unittest.cc b/chrome/common/metrics/variations/variations_util_unittest.cc
index 1f9e140851e397a22ac37dc31ce5b3b27c7c0529..8c3da3bc34ba7db4911d467aa65907dd84dbf879 100644
--- a/chrome/common/metrics/variations/variations_util_unittest.cc
+++ b/chrome/common/metrics/variations/variations_util_unittest.cc
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/metrics/variations/variations_util.h"
-
 #include <set>
 #include <string>
 
@@ -11,43 +9,13 @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "chrome/common/metrics/variations/variations_util.h"

[Alexei Svitkine (slow), 2013/09/03 15:46:35]

This should go to the top of the file. There were both conventions going on in
the Chromium codebase for a while, but the trend is now towards putting this at
the top.

Here's a discussion about it that made me change my mind (I previously used to
do it this way too):

https://codereview.chromium.org/12310109/#msg14

[gab, 2013/11/05 22:20:38]

Done.

+#include "chrome/common/metrics/variations/variations_util_win.h"
 #include "components/variations/metrics_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome_variations {
 
-namespace {
-
-const VariationID TEST_VALUE_A = 3300200;
-const VariationID TEST_VALUE_B = 3300201;
-const VariationID TEST_VALUE_C = 3300202;
-const VariationID TEST_VALUE_D = 3300203;
-
-// Tests whether a field trial is active (i.e. group() has been called on it).
-bool IsFieldTrialActive(const std::string& trial_name) {
-  base::FieldTrial::ActiveGroups active_groups;
-  base::FieldTrialList::GetActiveFieldTrialGroups(&active_groups);
-  for (size_t i = 0; i < active_groups.size(); ++i) {
-    if (active_groups[i].trial_name == trial_name)
-      return true;
-  }
-  return false;
-}
-
-// Call FieldTrialList::FactoryGetFieldTrial() with a future expiry date.
-scoped_refptr<base::FieldTrial> CreateFieldTrial(
-    const std::string& trial_name,
-    int total_probability,
-    const std::string& default_group_name,
-    int* default_group_number) {
-  return base::FieldTrialList::FactoryGetFieldTrial(
-      trial_name, total_probability, default_group_name,
-      base::FieldTrialList::kNoExpirationYear, 1, 1,
-      base::FieldTrial::SESSION_RANDOMIZED, default_group_number);
-}
-
-}  // namespace
-
 class VariationsUtilTest : public ::testing::Test {
  public:
   VariationsUtilTest() : field_trial_list_(NULL) {
@@ -158,7 +126,14 @@ TEST_F(VariationsUtilTest, GenerateExperimentChunks) {
   }
 }
 
+#if defined(OS_WIN)
+
 TEST_F(VariationsUtilTest, BuildGoogleUpdateExperimentLabel) {
+  const VariationID TEST_VALUE_A = 3300200;
+  const VariationID TEST_VALUE_B = 3300201;
+  const VariationID TEST_VALUE_C = 3300202;
+  const VariationID TEST_VALUE_D = 3300203;
+
   struct {
     const char* active_group_pairs;
     const char* expected_ids;
@@ -325,4 +300,6 @@ TEST_F(VariationsUtilTest, ExtractNonVariationLabels) {
   }
 }
 
+#endif  // defined(OS_WIN)
+
 }  // namespace chrome_variations