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

WebRTC-DeprecateGlobalFieldTrialString/Enabled/ - part 1

Browse Source 
This cl/
1) move WebRtcKeyValueConfig from api/transport to api/ directory.
2) add a test/ScopedKeyValueConfig (compare ScopedFieldTrials).
3) removes usage of webrtc::field_trial:: from the pc/ directory.
4) removes a few unused includes of system_wrappers/field_trial.h.

Bug: webrtc:10335
Change-Id: If29c07900dbe791050b0a5ad05332bedfad035f2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/253903
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36160}
This commit is contained in:
Jonas Oreland
2022-03-09 09:28:10 +01:00
committed by WebRTC LUCI CQ
parent fef0026f2f
commit ed99dae422
58 changed files with 450 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pc/test/integration_test_helpers.h
View File

@ -120,8 +120,8 @@
#include "rtc_base/time_utils.h"
#include "rtc_base/virtual_socket_server.h"
#include "system_wrappers/include/metrics.h"
#include "test/field_trial.h"
#include "test/gmock.h"
#include "test/scoped_key_value_config.h"
namespace webrtc {
@ -1366,9 +1366,9 @@ class PeerConnectionIntegrationBaseTest : public ::testing::Test {
fss_(new rtc::FirewallSocketServer(ss_.get())),
network_thread_(new rtc::Thread(fss_.get())),
worker_thread_(rtc::Thread::Create()),
field_trials_(field_trials.has_value()
? new test::ScopedFieldTrials(*field_trials)
: nullptr) {
// TODO(bugs.webrtc.org/10335): Pass optional ScopedKeyValueConfig.
field_trials_(new test::ScopedKeyValueConfig(
field_trials.has_value() ? *field_trials : "")) {
network_thread_->SetName("PCNetworkThread", this);
worker_thread_->SetName("PCWorkerThread", this);
RTC_CHECK(network_thread_->Start());
@ -1855,6 +1855,8 @@ class PeerConnectionIntegrationBaseTest : public ::testing::Test {
expected_cipher_suite);
}
const WebRtcKeyValueConfig& trials() const { return *field_trials_.get(); }
protected:
SdpSemantics sdp_semantics_;
@ -1874,7 +1876,7 @@ class PeerConnectionIntegrationBaseTest : public ::testing::Test {
std::vector<std::unique_ptr<cricket::TestTurnCustomizer>> turn_customizers_;
std::unique_ptr<PeerConnectionIntegrationWrapper> caller_;
std::unique_ptr<PeerConnectionIntegrationWrapper> callee_;
std::unique_ptr<test::ScopedFieldTrials> field_trials_;
std::unique_ptr<WebRtcKeyValueConfig> field_trials_;
};
} // namespace webrtc