Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / base / sslstreamadapter_unittest.cc

diff --git a/src/third_party/webrtc/base/sslstreamadapter_unittest.cc b/src/third_party/webrtc/base/sslstreamadapter_unittest.cc
index f7dcb71..b9d477d 100644 (file)
--- a/src/third_party/webrtc/base/sslstreamadapter_unittest.cc
+++ b/src/third_party/webrtc/base/sslstreamadapter_unittest.cc
@@ -194,14 +194,6 @@ class SSLStreamAdapterTestBase : public testing::Test,
     rtc::SetRandomTestMode(false);
   }
 
-  static void SetUpTestCase() {
-    rtc::InitializeSSL();
-  }
-
-  static void TearDownTestCase() {
-    rtc::CleanupSSL();
-  }
-
   // Recreate the client/server identities with the specified validity period.
   // |not_before| and |not_after| are offsets from the current time in number
   // of seconds.
@@ -691,6 +683,13 @@ TEST_F(SSLStreamAdapterTestTLS, TestTLSConnect) {
   TestHandshake();
 };
 
+// Test that closing the connection on one side updates the other side.
+TEST_F(SSLStreamAdapterTestTLS, TestTLSClose) {
+  TestHandshake();
+  client_ssl_->Close();
+  EXPECT_EQ_WAIT(rtc::SS_CLOSED, server_ssl_->GetState(), handshake_wait_);
+};
+
 // Test transfer -- trivial
 TEST_F(SSLStreamAdapterTestTLS, TestTLSTransfer) {
   TestHandshake();
@@ -751,7 +750,8 @@ TEST_F(SSLStreamAdapterTestDTLS,
 };
 
 // Test a handshake with small MTU
-TEST_F(SSLStreamAdapterTestDTLS, DISABLED_ON_MAC(TestDTLSConnectWithSmallMtu)) {
+// Disabled due to https://code.google.com/p/webrtc/issues/detail?id=3910
+TEST_F(SSLStreamAdapterTestDTLS, DISABLED_TestDTLSConnectWithSmallMtu) {
   MAYBE_SKIP_TEST(HaveDtls);
   SetMtu(700);
   SetHandshakeWait(20000);