Index: chrome/installer/util/user_experiment.cc |
diff --git a/chrome/installer/util/user_experiment.cc b/chrome/installer/util/user_experiment.cc |
index 4a63eef382250a8d7deff977ead773ea950f2084..af0bb6842719b5e544c24483477864d13dccb214 100644 |
--- a/chrome/installer/util/user_experiment.cc |
+++ b/chrome/installer/util/user_experiment.cc |
@@ -355,13 +355,10 @@ bool CreateExperimentDetails(int flavor, ExperimentDetails* experiment) { |
if (experiment_locale != locale && experiment_locale != L"*") |
continue; |
- std::vector<base::string16> brand_codes; |
- base::SplitString(kExperiments[i].brands, L',', &brand_codes); |
- if (brand_codes.empty()) |
- return false; |
- for (std::vector<base::string16>::iterator it = brand_codes.begin(); |
- it != brand_codes.end(); ++it) { |
- if (*it != brand && *it != L"*") |
+ for (const base::string16& cur : base::SplitString( |
+ kExperiments[i].brands, L",", |
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { |
+ if (cur != brand && cur != L"*") |
continue; |
// We have found our match. |
const UserExperimentSpecs& match = kExperiments[i]; |