Update To 11.40.268.0

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

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/peerconnection_unittest.cc b/src/third_party/libjingle/source/talk/app/webrtc/peerconnection_unittest.cc
index 977fc11..c250eea 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/peerconnection_unittest.cc
+++ b/src/third_party/libjingle/source/talk/app/webrtc/peerconnection_unittest.cc
@@ -46,8 +46,8 @@
 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h"
 #include "talk/app/webrtc/videosourceinterface.h"
 #include "talk/media/webrtc/fakewebrtcvideoengine.h"
-#include "talk/p2p/base/constants.h"
-#include "talk/p2p/base/sessiondescription.h"
+#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/sessiondescription.h"
 #include "talk/session/media/mediasession.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/scoped_ptr.h"
@@ -179,7 +179,7 @@ class PeerConnectionTestClientBase
       stream->AddTrack(CreateLocalVideoTrack(stream_label));
     }
 
-    EXPECT_TRUE(peer_connection_->AddStream(stream, NULL));
+    EXPECT_TRUE(peer_connection_->AddStream(stream));
   }
 
   size_t NumberOfLocalMediaStreams() {
@@ -426,7 +426,6 @@ class PeerConnectionTestClientBase
   }
 
   // PeerConnectionObserver callbacks.
-  virtual void OnError() {}
   virtual void OnMessage(const std::string&) {}
   virtual void OnSignalingMessage(const std::string& /*msg*/) {}
   virtual void OnSignalingChange(
@@ -919,9 +918,6 @@ class P2PTestConductor : public testing::Test {
     receiving_client_->VerifyLocalIceUfragAndPassword();
   }
 
-  P2PTestConductor() {
-    rtc::InitializeSSL(NULL);
-  }
   ~P2PTestConductor() {
     if (initiating_client_) {
       initiating_client_->set_signaling_message_receiver(NULL);
@@ -929,7 +925,6 @@ class P2PTestConductor : public testing::Test {
     if (receiving_client_) {
       receiving_client_->set_signaling_message_receiver(NULL);
     }
-    rtc::CleanupSSL();
   }
 
   bool CreateTestClients() {
@@ -1493,7 +1488,8 @@ TEST_F(JsepPeerConnectionP2PTestClient, ReceivedBweStatsAudio) {
 }
 
 // Test receive bandwidth stats with combined BWE.
-TEST_F(JsepPeerConnectionP2PTestClient, ReceivedBweStatsCombined) {
+// Disabled due to https://code.google.com/p/webrtc/issues/detail?id=3871.
+TEST_F(JsepPeerConnectionP2PTestClient, DISABLED_ReceivedBweStatsCombined) {
   FakeConstraints setup_constraints;
   setup_constraints.AddOptional(
       MediaConstraintsInterface::kCombinedAudioVideoBwe, true);
@@ -1519,7 +1515,8 @@ TEST_F(JsepPeerConnectionP2PTestClient, ReceivedBweStatsCombined) {
 
 // Test receive bandwidth stats with 1 video, 3 audio streams but no combined
 // BWE.
-TEST_F(JsepPeerConnectionP2PTestClient, ReceivedBweStatsNotCombined) {
+// Disabled due to https://code.google.com/p/webrtc/issues/detail?id=3871.
+TEST_F(JsepPeerConnectionP2PTestClient, DISABLED_ReceivedBweStatsNotCombined) {
   FakeConstraints setup_constraints;
   setup_constraints.AddOptional(
       MediaConstraintsInterface::kCombinedAudioVideoBwe, false);