diff options
| author | niklase <niklase@google.com> | 2015-09-10 17:44:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 00:44:58 +0000 |
| commit | a662720a0f792d6d51dbb6c31a2ceea4cab03bc0 (patch) | |
| tree | 5edfee88e65b9e0ac547d2732590b88c28bd3c0e /remoting/test | |
| parent | 896a3e90a6a8be31e21ab3c192664dbe7396fa4a (diff) | |
| download | chromium_src-a662720a0f792d6d51dbb6c31a2ceea4cab03bc0.zip chromium_src-a662720a0f792d6d51dbb6c31a2ceea4cab03bc0.tar.gz chromium_src-a662720a0f792d6d51dbb6c31a2ceea4cab03bc0.tar.bz2 | |
Roll WebRTC 9918:9920, Libjingle 9915:9920
WebRTC 9918:9920
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/8f226a6..0938a04
Libjingle 9915:9920
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/f150b27..df5ede1
TBR=sergeyu@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1333043002
Cr-Commit-Position: refs/heads/master@{#348300}
Diffstat (limited to 'remoting/test')
| -rw-r--r-- | remoting/test/fake_port_allocator.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/test/fake_port_allocator.cc b/remoting/test/fake_port_allocator.cc index 77b8bf8..d63243f 100644 --- a/remoting/test/fake_port_allocator.cc +++ b/remoting/test/fake_port_allocator.cc @@ -103,6 +103,7 @@ FakePortAllocator::FakePortAllocator( network_manager_(network_manager.Pass()), socket_factory_(socket_factory.Pass()) { set_flags(cricket::PORTALLOCATOR_DISABLE_TCP | + cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG | cricket::PORTALLOCATOR_ENABLE_IPV6 | cricket::PORTALLOCATOR_DISABLE_STUN | cricket::PORTALLOCATOR_DISABLE_RELAY); |