Chromium Code Reviews| Index: webrtc/test/field_trial.cc |
| diff --git a/webrtc/test/field_trial.cc b/webrtc/test/field_trial.cc |
| index 6b3d83cf563cc3d90a521d4b45f844ba5119bac4..ed3b883b54b2a0cde409ba018020416b6dea821a 100644 |
| --- a/webrtc/test/field_trial.cc |
| +++ b/webrtc/test/field_trial.cc |
| @@ -45,11 +45,14 @@ namespace test { |
| void InitFieldTrialsFromString(const std::string& trials_string) { |
| static const char kPersistentStringSeparator = '/'; |
| - // Catch an error if this is called more than once. |
| - assert(field_trials_initiated_ == false); |
| + assert(!field_trials_initiated_ || trials_string.empty()); |
| + |
| field_trials_initiated_ = true; |
| - if (trials_string.empty()) return; |
| + if (trials_string.empty()) { |
|
pbos-webrtc
2015/07/06 13:30:17
trials_string == "" reads better
|
| + field_trials_.clear(); |
| + return; |
| + } |
| size_t next_item = 0; |
| while (next_item < trials_string.length()) { |