zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't require call to ValidateFieldTrialsStringOrDie for ScopedFieldTrials.

Browse Source 
Bug: webrtc:9883
Change-Id: Iae7b2d22666ad57176237241a7f895cbd47cd26d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134311
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27846}
This commit is contained in:
Sebastian Jansson
2019-04-29 13:55:07 +02:00
committed by Commit Bot
parent cd16380703
commit 87a92d087c
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/field_trial.cc
View File

@ -20,19 +20,12 @@
#include "system_wrappers/include/field_trial.h"
namespace webrtc {
namespace {
bool field_trials_initiated_ = false;
} // namespace
namespace test {
namespace {
void ValidateFieldTrialsStringOrDie(const std::string& trials_string) {
void InnerValidateFieldTrialsStringOrDie(const std::string& trials_string) {
static const char kPersistentStringSeparator = '/';
// Catch an error if this is called more than once.
assert(!field_trials_initiated_);
field_trials_initiated_ = true;
if (trials_string.empty())
return;
@ -61,7 +54,6 @@ void ValidateFieldTrialsStringOrDie(const std::string& trials_string) {
// Successfully parsed all field trials from the string.
if (next_item == trials_string.length()) {
// webrtc::field_trial::InitFieldTrialsFromString(trials_string.c_str());
return;
}
}
@ -71,20 +63,24 @@ void ValidateFieldTrialsStringOrDie(const std::string& trials_string) {
// Using abort so it crashes in both debug and release mode.
abort();
}
} // namespace
void ValidateFieldTrialsStringOrDie(const std::string& trials_string) {
static bool field_trials_initiated_ = false;
// Catch an error if this is called more than once.
assert(!field_trials_initiated_);
field_trials_initiated_ = true;
InnerValidateFieldTrialsStringOrDie(trials_string);
}
ScopedFieldTrials::ScopedFieldTrials(const std::string& config)
: previous_field_trials_(webrtc::field_trial::GetFieldTrialString()) {
assert(field_trials_initiated_);
field_trials_initiated_ = false;
current_field_trials_ = config;
ValidateFieldTrialsStringOrDie(current_field_trials_);
InnerValidateFieldTrialsStringOrDie(current_field_trials_);
webrtc::field_trial::InitFieldTrialsFromString(current_field_trials_.c_str());
}
ScopedFieldTrials::~ScopedFieldTrials() {
// Should still be initialized, since InitFieldTrials is called from ctor.
// That's why we don't restore the flag.
assert(field_trials_initiated_);
webrtc::field_trial::InitFieldTrialsFromString(previous_field_trials_);
}