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

chrome/common/metrics/variations/variations_util_unittest.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 "chrome/common/metrics/variations/variations_util.h"
-
 #include <set>
 #include <string>
 
 #include "base/metrics/field_trial.h"
 #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) {
   }
 
   virtual ~VariationsUtilTest() {
     // Ensure that the maps are cleared between tests, since they are stored as
     // process singletons.
     testing::ClearAllVariationIDs();
   }
@@ skipping 90 matching lines @@
       experiments.push_back(UTF8ToUTF16(kExperimentStrings[j]));
 
     std::vector<string16> chunks;
     GenerateVariationChunks(experiments, &chunks);
     ASSERT_EQ(cases[i].expected_chunks_length, chunks.size());
     for (size_t j = 0; j < chunks.size(); ++j)
       EXPECT_EQ(UTF8ToUTF16(cases[i].expected_chunks[j]), chunks[j]);
   }
 }
 
+#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;
   } test_cases[] = {
     // Empty group.
     {"", ""},
     // Group of 1.
     {"FieldTrialA#Default", "3300200"},
     // Group of 1, doesn't have an associated ID.
     {"FieldTrialA#DoesNotExist", ""},
@@ skipping 146 matching lines @@
     {";;;;", ""},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     std::string non_variation_labels = UTF16ToUTF8(
         ExtractNonVariationLabels(ASCIIToUTF16(test_cases[i].input_label)));
     EXPECT_EQ(test_cases[i].expected_output, non_variation_labels);
   }
 }
 
+#endif  // defined(OS_WIN)
+
 }  // namespace chrome_variations