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

Update talk to 52534915.

Browse Source 
R=sergeyu@chromium.org

Review URL: https://webrtc-codereview.appspot.com/2251004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4786 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org
2013-09-19 05:49:50 +00:00
parent 532f3dc548
commit 967bfff54d
44 changed files with 647 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
talk/app/webrtc/webrtcsession_unittest.cc
View File

@ -275,7 +275,8 @@ class WebRtcSessionTest : public testing::Test {
ss_scope_(fss_.get()),
stun_server_(talk_base::Thread::Current(), kStunAddr),
allocator_(&network_manager_, kStunAddr,
SocketAddress(), SocketAddress(), SocketAddress()) {
SocketAddress(), SocketAddress(), SocketAddress()),
mediastream_signaling_(channel_manager_.get()) {
tdesc_factory_->set_protocol(cricket::ICEPROTO_HYBRID);
allocator_.set_flags(cricket::PORTALLOCATOR_DISABLE_TCP |
cricket::PORTALLOCATOR_DISABLE_RELAY |
@ -2485,9 +2486,9 @@ TEST_F(WebRtcSessionTest, TestRtpDataChannelConstraintTakesPrecedence) {
EXPECT_EQ(cricket::DCT_RTP, data_engine_->last_channel_type());
}
// Test fails on windows. https://code.google.com/p/webrtc/issues/detail?id=2374
TEST_F(WebRtcSessionTest,
DISABLED_TestCreateOfferWithSctpEnabledWithoutStreams) {
TEST_F(WebRtcSessionTest, TestCreateOfferWithSctpEnabledWithoutStreams) {
MAYBE_SKIP_TEST(talk_base::SSLStreamAdapter::HaveDtlsSrtp);
constraints_.reset(new FakeConstraints());
constraints_->AddOptional(
webrtc::MediaConstraintsInterface::kEnableSctpDataChannels, true);