Upstream version 7.36.149.0

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

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/test/peerconnectiontestwrapper.cc b/src/third_party/libjingle/source/talk/app/webrtc/test/peerconnectiontestwrapper.cc
index 91b6668..d7c30a8 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/test/peerconnectiontestwrapper.cc
+++ b/src/third_party/libjingle/source/talk/app/webrtc/test/peerconnectiontestwrapper.cc
@@ -26,6 +26,7 @@
  */
 
 #include "talk/app/webrtc/fakeportallocatorfactory.h"
+#include "talk/app/webrtc/test/fakedtlsidentityservice.h"
 #include "talk/app/webrtc/test/fakeperiodicvideocapturer.h"
 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
 #include "talk/app/webrtc/test/peerconnectiontestwrapper.h"
@@ -93,8 +94,11 @@ bool PeerConnectionTestWrapper::CreatePc(
   webrtc::PeerConnectionInterface::IceServer ice_server;
   ice_server.uri = "stun:stun.l.google.com:19302";
   ice_servers.push_back(ice_server);
+  FakeIdentityService* dtls_service =
+      talk_base::SSLStreamAdapter::HaveDtlsSrtp() ?
+          new FakeIdentityService() : NULL;
   peer_connection_ = peer_connection_factory_->CreatePeerConnection(
-      ice_servers, constraints, allocator_factory_.get(), NULL, this);
+      ice_servers, constraints, allocator_factory_.get(), dtls_service, this);
 
   return peer_connection_.get() != NULL;
 }
@@ -204,7 +208,9 @@ void PeerConnectionTestWrapper::WaitForConnection() {
 
 bool PeerConnectionTestWrapper::CheckForConnection() {
   return (peer_connection_->ice_connection_state() ==
-          PeerConnectionInterface::kIceConnectionConnected);
+          PeerConnectionInterface::kIceConnectionConnected) ||
+         (peer_connection_->ice_connection_state() ==
+          PeerConnectionInterface::kIceConnectionCompleted);
 }
 
 void PeerConnectionTestWrapper::WaitForAudio() {