Extend VariationParamsManager to support feature associations.

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 <memory>
 #include <string>
 #include <vector>
 
-#include "base/metrics/field_trial.h"
 #include "components/variations/active_field_trials.h"
 
 // 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.
 //
@@ skipping 14 matching lines @@
 //  // use |value|, which will be "" if it does not exist
 //
 // VariationID id = GetGoogleVariationID(GOOGLE_WEB_PROPERTIES, "trial",
 //                                       "group1");
 // if (id != variations::kEmptyID) {
 //   // use |id|
 // }
 
 namespace base {
 struct Feature;
-}
+class FieldTrialList;
+}  // namespace base
 
 namespace variations {
 
 typedef int VariationID;
 class VariationsHttpHeaderProvider;
 
 const VariationID EMPTY_ID = 0;
 
 // A key into the Associate/Get methods for VariationIDs. This is used to create
 // separate ID associations for separate parties interested in VariationIDs.
@@ skipping 101 matching lines @@
 // exist, returns an empty string.Calling this function will result in the
 // associated field trial being marked as active if found (i.e. group() will be
 // called on it), if it wasn't already. Currently, this information is only
 // available from the browser process. Thread safe.
 std::string GetVariationParamValueByFeature(const base::Feature& feature,
                                             const std::string& param_name);
 
 // Expose some functions for testing.
 namespace testing {
 
-// Use this class as a member in your test class to set variation params for
-// your tests. You can directly set the parameters in the constructor (if they
-// are used by other members upon construction). You can change them later
-// arbitrarily many times using the SetVariationParams function. Internally, it
-// creates a FieldTrialList as a member. It works well for multiple tests of a
-// given test class, as it clears the parameters when this class is destructed.
-// Note that it clears all parameters (not just those registered here).
-class VariationParamsManager {
- public:
-  VariationParamsManager(const std::string& trial_name,
-                         const std::map<std::string, std::string>& params);
-  ~VariationParamsManager();
-
-  // Associates |params| with the given |trial_name|. It creates a new group,
-  // used only for testing. Between two calls of this function,
-  // ClearAllVariationParams() has to be called.
-  void SetVariationParams(const std::string& trial_name,
-                          const std::map<std::string, std::string>& params);
-
- private:
-  std::unique_ptr<base::FieldTrialList> field_trial_list_;
-
-  DISALLOW_COPY_AND_ASSIGN(VariationParamsManager);
-};
-
-// Clears all of the mapped associations.
+// Clears all of the mapped associations. Deprecated, try to use
+// VariationParamsManager instead as it does a lot of work for you
+// automatically.
 void ClearAllVariationIDs();
 
-// Clears all of the associated params.
+// Clears all of the associated params. Deprecated, try to use
+// VariationParamsManager instead as it does a lot of work for you
+// automatically.
 void ClearAllVariationParams();
 
 }  // namespace testing
 
 }  // namespace variations
 
 #endif  // COMPONENTS_VARIATIONS_VARIATIONS_ASSOCIATED_DATA_H_