diff --git a/p2p/base/ice_controller_factory_interface.h b/p2p/base/ice_controller_factory_interface.h index a859c07be9..bae8b8f19d 100644 --- a/p2p/base/ice_controller_factory_interface.h +++ b/p2p/base/ice_controller_factory_interface.h @@ -12,6 +12,7 @@ #define P2P_BASE_ICE_CONTROLLER_FACTORY_INTERFACE_H_ #include +#include #include "p2p/base/ice_controller_interface.h" #include "p2p/base/ice_transport_internal.h" @@ -24,6 +25,7 @@ struct IceControllerFactoryArgs { std::function ice_role_func; std::function is_connection_pruned_func; const IceFieldTrials* ice_field_trials; + std::string ice_controller_field_trials; }; class IceControllerFactoryInterface { diff --git a/p2p/base/p2p_transport_channel.cc b/p2p/base/p2p_transport_channel.cc index e3e61945cb..33325693b9 100644 --- a/p2p/base/p2p_transport_channel.cc +++ b/p2p/base/p2p_transport_channel.cc @@ -174,8 +174,7 @@ P2PTransportChannel::P2PTransportChannel( ice_event_log_.set_event_log(event_log); IceControllerFactoryArgs args{ - [this] { return GetState(); }, - [this] { return GetIceRole(); }, + [this] { return GetState(); }, [this] { return GetIceRole(); }, [this](const Connection* connection) { // TODO(webrtc:10647/jonaso): Figure out a way to remove friendship // between P2PTransportChannel and Connection. @@ -183,7 +182,7 @@ P2PTransportChannel::P2PTransportChannel( IsRemoteCandidatePruned(connection->remote_candidate()); }, &field_trials_, - }; + webrtc::field_trial::FindFullName("WebRTC-IceControllerFieldTrials")}; if (ice_controller_factory != nullptr) { ice_controller_ = ice_controller_factory->Create(args); } else {