| Index: webrtc/test/field_trial.cc
|
| diff --git a/webrtc/test/field_trial.cc b/webrtc/test/field_trial.cc
|
| index 6b3d83cf563cc3d90a521d4b45f844ba5119bac4..1f56ad32d73889edaadfe20c83a6374d59886d49 100644
|
| --- a/webrtc/test/field_trial.cc
|
| +++ b/webrtc/test/field_trial.cc
|
| @@ -45,11 +45,12 @@ 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);
|
| field_trials_initiated_ = true;
|
|
|
| - if (trials_string.empty()) return;
|
| + if (trials_string.empty()) {
|
| + field_trials_.clear();
|
| + return;
|
| + }
|
|
|
| size_t next_item = 0;
|
| while (next_item < trials_string.length()) {
|
|
|