Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / app / webrtc / peerconnectioninterface_unittest.cc

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface_unittest.cc b/src/third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface_unittest.cc
index 97a4176..a605b0d 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface_unittest.cc
+++ b/src/third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface_unittest.cc
@@ -259,8 +259,9 @@ class PeerConnectionInterfaceTest : public testing::Test {
 
     port_allocator_factory_ = FakePortAllocatorFactory::Create();
 
-    // TODO(jiayl): we should always pass a FakeIdentityService so that DTLS
-    // is enabled by default like in Chrome (issue 2838).
+    // DTLS does not work in a loopback call, so is disabled for most of the
+    // tests in this file. We only create a FakeIdentityService if the test
+    // explicitly sets the constraint.
     FakeIdentityService* dtls_service = NULL;
     bool dtls;
     if (FindConstraint(constraints,
@@ -300,7 +301,7 @@ class PeerConnectionInterfaceTest : public testing::Test {
     EXPECT_EQ(0u, port_allocator_factory_->turn_configs().size());
 
     CreatePeerConnection(kTurnIceServerUri, kTurnPassword, NULL);
-    EXPECT_EQ(1u, port_allocator_factory_->stun_configs().size());
+    EXPECT_EQ(0u, port_allocator_factory_->stun_configs().size());
     EXPECT_EQ(1u, port_allocator_factory_->turn_configs().size());
     EXPECT_EQ(kTurnUsername,
               port_allocator_factory_->turn_configs()[0].username);
@@ -308,8 +309,6 @@ class PeerConnectionInterfaceTest : public testing::Test {
               port_allocator_factory_->turn_configs()[0].password);
     EXPECT_EQ(kTurnHostname,
               port_allocator_factory_->turn_configs()[0].server.hostname());
-    EXPECT_EQ(kTurnHostname,
-              port_allocator_factory_->stun_configs()[0].server.hostname());
   }
 
   void ReleasePeerConnection() {