Chromium Code Reviews| Index: content/renderer/media/media_stream_dependency_factory.cc |
| diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc |
| index 0b13677591bdc9f112b074d380a6557030c8c5a8..1fbbcd71266cf103867d920f86cde0c013937bdc 100644 |
| --- a/content/renderer/media/media_stream_dependency_factory.cc |
| +++ b/content/renderer/media/media_stream_dependency_factory.cc |
| @@ -7,6 +7,7 @@ |
| #include <vector> |
| #include "base/command_line.h" |
| +#include "base/metrics/field_trial.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "base/synchronization/waitable_event.h" |
| #include "content/common/media/media_stream_messages.h" |
| @@ -41,6 +42,7 @@ |
| #include "third_party/WebKit/public/web/WebDocument.h" |
| #include "third_party/WebKit/public/web/WebFrame.h" |
| #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h" |
| +#include "third_party/webrtc/system_wrappers/interface/field_trial.h" |
| #if defined(USE_OPENSSL) |
| #include "third_party/libjingle/source/talk/base/ssladapter.h" |
| @@ -269,6 +271,9 @@ void MediaStreamDependencyFactory::CreatePeerConnectionFactory() { |
| DVLOG(1) << "MediaStreamDependencyFactory::CreatePeerConnectionFactory()"; |
| + // Initialize webrtc field trial before start calling into webrtc code. |
| + webrtc::FieldTrial::Init(&base::FieldTrialList::FindFullName); |
|
tommi (sloooow) - chröme
2014/05/07 12:49:33
Would InitializeWebRtcModule be a better place to
|
| + |
| jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop(); |
| jingle_glue::JingleThreadWrapper::current()->set_send_allowed(true); |
| signaling_thread_ = jingle_glue::JingleThreadWrapper::current(); |