| Index: components/variations/variations_http_header_provider.cc
|
| diff --git a/components/variations/variations_http_header_provider.cc b/components/variations/variations_http_header_provider.cc
|
| index d77a4bf8e3d024de175152d6e74580b836cb47e0..ccd4fd124dba6438ace2baef3840e6f3e02405f1 100644
|
| --- a/components/variations/variations_http_header_provider.cc
|
| +++ b/components/variations/variations_http_header_provider.cc
|
| @@ -56,12 +56,32 @@ std::string VariationsHttpHeaderProvider::GetVariationsString() {
|
| return ids_string;
|
| }
|
|
|
| +bool VariationsHttpHeaderProvider::ForceVariationIds(
|
| + std::vector<std::string>* variation_ids,
|
| + const std::string& command_line_variation_ids) {
|
| + if (!command_line_variation_ids.empty()) {
|
| + // Combine |variation_ids| with |command_line_variation_ids|.
|
| + std::vector<std::string> variation_ids_flags =
|
| + base::SplitString(command_line_variation_ids, ",",
|
| + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
|
| + variation_ids->insert(variation_ids->end(), variation_ids_flags.begin(),
|
| + variation_ids_flags.end());
|
| + }
|
| +
|
| + if (!variation_ids->empty()) {
|
| + // Create default variation ids which will always be included in the
|
| + // X-Client-Data request header.
|
| + return SetDefaultVariationIds(*variation_ids);
|
| + }
|
| + return true;
|
| +}
|
| +
|
| +
|
| bool VariationsHttpHeaderProvider::SetDefaultVariationIds(
|
| - const std::string& variation_ids) {
|
| + const std::vector<std::string>& variation_ids) {
|
| default_variation_ids_set_.clear();
|
| default_trigger_id_set_.clear();
|
| - for (const base::StringPiece& entry : base::SplitStringPiece(
|
| - variation_ids, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
|
| + for (const std::string& entry : variation_ids) {
|
| if (entry.empty()) {
|
| default_variation_ids_set_.clear();
|
| default_trigger_id_set_.clear();
|
|
|