Index: base/feature_list.cc |
diff --git a/base/feature_list.cc b/base/feature_list.cc |
index 353136c12be5c73516c5c89a644558a60fba336b..61043ceb731fa7bf2c6891c67c95882121d5afa7 100644 |
--- a/base/feature_list.cc |
+++ b/base/feature_list.cc |
@@ -228,9 +228,9 @@ FieldTrial* FeatureList::GetFieldTrial(const Feature& feature) { |
} |
// static |
-std::vector<std::string> FeatureList::SplitFeatureListString( |
- const std::string& input) { |
- return SplitString(input, ",", TRIM_WHITESPACE, SPLIT_WANT_NONEMPTY); |
+std::vector<base::StringPiece> FeatureList::SplitFeatureListString( |
+ base::StringPiece input) { |
+ return SplitStringPiece(input, ",", TRIM_WHITESPACE, SPLIT_WANT_NONEMPTY); |
} |
// static |
@@ -340,7 +340,7 @@ void FeatureList::RegisterOverridesFromCommandLine( |
const std::string& feature_list, |
OverrideState overridden_state) { |
for (const auto& value : SplitFeatureListString(feature_list)) { |
- StringPiece feature_name(value); |
+ StringPiece feature_name = value; |
base::FieldTrial* trial = nullptr; |
// The entry may be of the form FeatureName<FieldTrialName - in which case, |
@@ -348,7 +348,7 @@ void FeatureList::RegisterOverridesFromCommandLine( |
std::string::size_type pos = feature_name.find('<'); |
if (pos != std::string::npos) { |
feature_name.set(value.data(), pos); |
- trial = base::FieldTrialList::Find(value.substr(pos + 1)); |
+ trial = base::FieldTrialList::Find(value.substr(pos + 1).as_string()); |
} |
RegisterOverride(feature_name, overridden_state, trial); |