commit 4d9d09721734da31b5e28980f6a1fefee42cb409
author pbos <pbos@webrtc.org> Fri Jul 10 00:21:06 2015
committer Commit bot <commit-bot@chromium.org> Fri Jul 10 00:21:10 2015
tree 21b9aeff75f90136297622df209c4d2ee9de1472
parent 97f44e1bf6ea116fff03bc204c305fffeb08467f

Fix follow-up in webrtc/test/field_trial.cc.

BUG=webrtc:4820
R=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1215713019

Cr-Commit-Position: refs/heads/master@{#9563}

webrtc/test/field_trial.cc

diff --git a/webrtc/test/field_trial.cc b/webrtc/test/field_trial.cc
index 05ca052..51bd920 100644
--- a/webrtc/test/field_trial.cc
+++ b/webrtc/test/field_trial.cc
@@ -46,7 +46,7 @@
   static const char kPersistentStringSeparator = '/';
 
   // Catch an error if this is called more than once.
-  assert(field_trials_initiated_ == false);
+  assert(!field_trials_initiated_);
   field_trials_initiated_ = true;
 
   if (trials_string.empty())
@@ -77,10 +77,10 @@
     if (next_item == trials_string.length())
       return;
   }
-  // LOG does not prints when this is called early on main.
+  // Using fprintf as LOG does not print when this is called early in main.
   fprintf(stderr, "Invalid field trials string.\n");
 
-  // Using abort so it crashs both in debug and release mode.
+  // Using abort so it crashes in both debug and release mode.
   abort();
 }
 
@@ -88,11 +88,14 @@
     : previous_field_trials_(field_trials_) {
   assert(field_trials_initiated_);
   field_trials_initiated_ = false;
-  field_trials_ = std::map<std::string, std::string>();
+  field_trials_.clear();
   InitFieldTrialsFromString(config);
 }
 
 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_);
   field_trials_ = previous_field_trials_;
 }