commit f81b0f11a6520074953edddd77a7e7f1dd7deb86
author Ivo Creusen <ivoc@webrtc.org> Tue Sep 11 10:30:58 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Sep 11 09:27:11 2018 +0000
tree a13b5b585524b7ddf0d1a9a21e092a01843cf539
parent eb58464f82d1b308850a1d2fd4b6ccddd3627d5a

Move code for setting field trials from NetEqTestFactory to the main function in neteq_rtpplay.

It is problematic to set field trials more than once, so to avoid running into problems, this functionality has been placed in the main function of neteq_rtpplay.

Bug: webrtc:9667
Change-Id: Ib9b9990f30a1715b50889dbfc4d74787bcbe5dae
Reviewed-on: https://webrtc-review.googlesource.com/98541
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Ivo Creusen <ivoc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24673}

modules/audio_coding/BUILD.gn

diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 09b9df5..ff5ae13 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1515,7 +1515,6 @@
       defines = []
       deps = [
         "../../rtc_base:checks",
-        "../../test:field_trial",
         "../../test:fileutils",
       ]
       sources = [
@@ -1545,6 +1544,9 @@
       deps = [
         ":neteq_test_factory",
         ":neteq_test_tools",
+        "../../rtc_base:rtc_base_approved",
+        "../../system_wrappers:field_trial_default",
+        "../../test:field_trial",
       ]
       sources = [
         "neteq/tools/neteq_rtpplay.cc",