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

chrome/common/metrics/variations/experiment_labels_win_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "chrome/common/metrics/variations/variations_util.h"
+#include "chrome/common/metrics/variations/experiment_labels_win.h"
 
 #include <set>
 #include <string>
+#include <vector>
 
+#include "base/basictypes.h"
 #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 "components/variations/metrics_util.h"
+#include "components/variations/variations_associated_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chrome_variations {
 
-namespace {
+TEST(ExperimentLabelsTest, 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;
 
-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();
-  }
-
- private:
-  base::FieldTrialList field_trial_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(VariationsUtilTest);
-};
-
-TEST_F(VariationsUtilTest, GetFieldTrialActiveGroups) {
-  typedef std::set<ActiveGroupId, ActiveGroupIdCompare> ActiveGroupIdSet;
-  std::string trial_one("trial one");
-  std::string group_one("group one");
-  std::string trial_two("trial two");
-  std::string group_two("group two");
-
-  base::FieldTrial::ActiveGroups active_groups;
-  base::FieldTrial::ActiveGroup active_group;
-  active_group.trial_name = trial_one;
-  active_group.group_name = group_one;
-  active_groups.push_back(active_group);
-
-  active_group.trial_name = trial_two;
-  active_group.group_name = group_two;
-  active_groups.push_back(active_group);
-
-  // Create our expected groups of IDs.
-  ActiveGroupIdSet expected_groups;
-  ActiveGroupId name_group_id;
-  name_group_id.name = metrics::HashName(trial_one);
-  name_group_id.group = metrics::HashName(group_one);
-  expected_groups.insert(name_group_id);
-  name_group_id.name = metrics::HashName(trial_two);
-  name_group_id.group = metrics::HashName(group_two);
-  expected_groups.insert(name_group_id);
-
-  std::vector<ActiveGroupId> active_group_ids;
-  testing::TestGetFieldTrialActiveGroupIds(active_groups, &active_group_ids);
-  EXPECT_EQ(2U, active_group_ids.size());
-  for (size_t i = 0; i < active_group_ids.size(); ++i) {
-    ActiveGroupIdSet::iterator expected_group =
-        expected_groups.find(active_group_ids[i]);
-    EXPECT_FALSE(expected_group == expected_groups.end());
-    expected_groups.erase(expected_group);
-  }
-  EXPECT_EQ(0U, expected_groups.size());
-}
-
-TEST_F(VariationsUtilTest, BuildGoogleUpdateExperimentLabel) {
   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 59 matching lines @@
     for (std::vector<std::string>::const_iterator it =
              expected_ids_list.begin(); it != expected_ids_list.end(); ++it) {
       std::set<std::string>::iterator it2 = parsed_ids.find(*it);
       EXPECT_TRUE(parsed_ids.end() != it2);
       parsed_ids.erase(it2);
     }
     EXPECT_TRUE(parsed_ids.empty());
   }  // for
 }
 
-TEST_F(VariationsUtilTest, CombineExperimentLabels) {
+TEST(ExperimentLabelsTest, CombineExperimentLabels) {
   struct {
     const char* variations_labels;
     const char* other_labels;
     const char* expected_label;
   } test_cases[] = {
     {"A=B|Tue, 21 Jan 2014 15:30:21 GMT",
      "C=D|Tue, 21 Jan 2014 15:30:21 GMT",
      "C=D|Tue, 21 Jan 2014 15:30:21 GMT;A=B|Tue, 21 Jan 2014 15:30:21 GMT"},
     {"A=B|Tue, 21 Jan 2014 15:30:21 GMT",
      "",
@@ skipping 11 matching lines @@
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); ++i) {
     std::string result = UTF16ToUTF8(CombineExperimentLabels(
         ASCIIToUTF16(test_cases[i].variations_labels),
         ASCIIToUTF16(test_cases[i].other_labels)));
     EXPECT_EQ(test_cases[i].expected_label, result);
   }
 }
 
-TEST_F(VariationsUtilTest, ExtractNonVariationLabels) {
+TEST(ExperimentLabelsTest, ExtractNonVariationLabels) {
   struct {
     const char* input_label;
     const char* expected_output;
   } test_cases[] = {
     // Empty
     {"", ""},
     // One
     {"gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT",
      "gcapi_brand=123|Tue, 21 Jan 2014 15:30:21 GMT"},
     // Three
@@ skipping 35 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);
   }
 }
 
 }  // namespace chrome_variations