Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4022)

Unified Diff: chrome/installer/gcapi/gcapi_omaha_experiment.cc

Issue 1240183002: Update SplitString calls in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/variations/variations_util.cc ('k') | chrome/installer/util/compat_checks.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/gcapi/gcapi_omaha_experiment.cc
diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment.cc b/chrome/installer/gcapi/gcapi_omaha_experiment.cc
index a790a264c1c89f5de61562c3fe75dc1bea1b6021..1724b971d4a4d9804368a4ac2b68836127f8078f 100644
--- a/chrome/installer/gcapi/gcapi_omaha_experiment.cc
+++ b/chrome/installer/gcapi/gcapi_omaha_experiment.cc
@@ -42,9 +42,10 @@ bool SetExperimentLabel(const wchar_t* brand_code,
}
// Split the original labels by the label separator.
- std::vector<base::string16> entries;
- base::SplitString(original_labels, google_update::kExperimentLabelSeparator,
- &entries);
+ std::vector<base::string16> entries = base::SplitString(
+ original_labels,
+ base::string16(1, google_update::kExperimentLabelSeparator),
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
// Keep all labels, but the one we want to add/replace.
base::string16 label_and_separator(label);
« no previous file with comments | « chrome/common/variations/variations_util.cc ('k') | chrome/installer/util/compat_checks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698