From 227574804f62684c99a38d1f6372e57d407369cb Mon Sep 17 00:00:00 2001
From: Emil Lundmark <lndmrk@webrtc.org>
Date: Tue, 28 Feb 2023 16:08:03 +0100
Subject: [PATCH] Correctly register test field trials in parser unittest

Previously, field_trial::FindFullName would be called before
field_trial::FieldTrialsAllowedInScopeForTesting was initialized because
member variables will be initialized after the initializer list.

Bug: webrtc:14154
Change-Id: I69098259a21a55a268d5b45949c3ed02e82ae001
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295541
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39420}
---
 rtc_base/experiments/field_trial_parser_unittest.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/rtc_base/experiments/field_trial_parser_unittest.cc b/rtc_base/experiments/field_trial_parser_unittest.cc
index 33d275a31c..73d115357f 100644
--- a/rtc_base/experiments/field_trial_parser_unittest.cc
+++ b/rtc_base/experiments/field_trial_parser_unittest.cc
@@ -30,10 +30,12 @@ struct DummyExperiment {
   FieldTrialParameter<std::string> hash =
       FieldTrialParameter<std::string>("h", "a80");
 
-  field_trial::FieldTrialsAllowedInScopeForTesting k{{kDummyExperiment}};
-
   DummyExperiment()
-      : DummyExperiment(field_trial::FindFullName(kDummyExperiment)) {}
+      : DummyExperiment([] {
+          field_trial::FieldTrialsAllowedInScopeForTesting k{
+              {kDummyExperiment}};
+          return field_trial::FindFullName(kDummyExperiment);
+        }()) {}
 
   explicit DummyExperiment(absl::string_view field_trial) {
     ParseFieldTrial({&enabled, &factor, &retries, &size, &ping, &hash},