Move active field trial API to variations component.

components/variations/variations_associated_data.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 COMPONENTS_VARIATIONS_VARIATIONS_ASSOCIATED_DATA_H_
 #define COMPONENTS_VARIATIONS_VARIATIONS_ASSOCIATED_DATA_H_
 
 #include <map>
 #include <string>
 
 #include "base/metrics/field_trial.h"
+#include "components/variations/active_field_trials.h"

[Ilya Sherman, 2014/05/19 12:29:42]

nit: Can this be moved into the .cc file?

[Alexei Svitkine (slow), 2014/05/19 12:50:47]

Done.

 
 // This file provides various helpers that extend the functionality around
 // base::FieldTrial.
 //
 // This includes several simple APIs to handle getting and setting additional
 // data related to Chrome variations, such as parameters and Google variation
 // IDs. These APIs are meant to extend the base::FieldTrial APIs to offer extra
 // functionality that is not offered by the simpler base::FieldTrial APIs.
 //
 // The AssociateGoogleVariationID and AssociateVariationParams functions are
@@ skipping 17 matching lines @@
 // if (id != chrome_variations::kEmptyID) {
 //   // use |id|
 // }
 
 namespace chrome_variations {
 
 typedef int VariationID;
 
 const VariationID EMPTY_ID = 0;
 
-// The Unique ID of a trial and its active group, where the name and group
-// identifiers are hashes of the trial and group name strings.
-struct ActiveGroupId {
-  uint32 name;
-  uint32 group;
-};
-
-// Returns an ActiveGroupId struct for the given trial and group names.
-ActiveGroupId MakeActiveGroupId(const std::string& trial_name,
-                                const std::string& group_name);
-
-// We need to supply a Compare class for templates since ActiveGroupId is a
-// user-defined type.
-struct ActiveGroupIdCompare {
-  bool operator() (const ActiveGroupId& lhs, const ActiveGroupId& rhs) const {
-    // The group and name fields are just SHA-1 Hashes, so we just need to treat
-    // them as IDs and do a less-than comparison. We test group first, since
-    // name is more likely to collide.
-    if (lhs.group != rhs.group)
-      return lhs.group < rhs.group;
-    return lhs.name < rhs.name;
-  }
-};
-
 // A key into the Associate/Get methods for VariationIDs. This is used to create
 // separate ID associations for separate parties interested in VariationIDs.
 enum IDCollectionKey {
   // This collection is used by Google web properties, transmitted through the
   // X-Client-Data header.
   GOOGLE_WEB_PROPERTIES,
   // This collection is used by Google web properties for IDs that trigger
   // server side experimental behavior, transmitted through the
   // X-Client-Data header.
   GOOGLE_WEB_PROPERTIES_TRIGGER,
@@ skipping 67 matching lines @@
 void ClearAllVariationIDs();
 
 // Clears all of the associated params.
 void ClearAllVariationParams();
 
 }  // namespace testing
 
 }  // namespace chrome_variations
 
 #endif  // COMPONENTS_VARIATIONS_VARIATIONS_ASSOCIATED_DATA_H_