Revert 128266 - Added a pepper test for SSLHandshake. This starts an SSL server which the test can connect to.

BUG=114626
TEST=Ran pepper TCP tests.


Review URL: http://codereview.chromium.org/9791003

TBR=raymes@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9836015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128268 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 32 deletions

diff --git a/ppapi/tests/test_tcp_socket_private.cc b/ppapi/tests/test_tcp_socket_private.cc
index 6bffe49..ee2d71f 100644
--- a/ppapi/tests/test_tcp_socket_private.cc
+++ b/ppapi/tests/test_tcp_socket_private.cc
@@ -40,16 +40,12 @@ bool TestTCPSocketPrivate::Init() {
   if (!GetLocalHostPort(instance_->pp_instance(), &host_, &port_))
     return false;
 
-  // Get the port for the SSL server.
-  ssl_port_ = instance_->ssl_server_port();
-
   return true;
 }
 
 void TestTCPSocketPrivate::RunTests(const std::string& filter) {
   RUN_TEST_FORCEASYNC_AND_NOT(Basic, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(ReadWrite, filter);
-  RUN_TEST_FORCEASYNC_AND_NOT(ReadWriteSSL, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(ConnectAddress, filter);
 }
 
@@ -95,34 +91,6 @@ std::string TestTCPSocketPrivate::TestReadWrite() {
   PASS();
 }
 
-std::string TestTCPSocketPrivate::TestReadWriteSSL() {
-  pp::TCPSocketPrivate socket(instance_);
-  TestCompletionCallback cb(instance_->pp_instance(), force_async_);
-
-  int32_t rv = socket.Connect(host_.c_str(), ssl_port_, cb);
-  ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
-  if (rv == PP_OK_COMPLETIONPENDING)
-    rv = cb.WaitForResult();
-  ASSERT_EQ(PP_OK, rv);
-
-  rv = socket.SSLHandshake(host_.c_str(), ssl_port_, cb);
-  ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
-  if (rv == PP_OK_COMPLETIONPENDING)
-    rv = cb.WaitForResult();
-  ASSERT_EQ(PP_OK, rv);
-
-  ASSERT_EQ(PP_OK, WriteStringToSocket(&socket, "GET / HTTP/1.0\r\n\r\n"));
-
-  // Read up to the first \n and check that it looks like valid HTTP response.
-  std::string s;
-  ASSERT_EQ(PP_OK, ReadFirstLineFromSocket(&socket, &s));
-  ASSERT_TRUE(ValidateHttpResponse(s));
-
-  socket.Disconnect();
-
-  PASS();
-}
-
 std::string TestTCPSocketPrivate::TestConnectAddress() {
   PP_NetAddress_Private address;
 
@@ -160,6 +128,8 @@ std::string TestTCPSocketPrivate::TestConnectAddress() {
   PASS();
 }
 
+// TODO(viettrungluu): Try testing SSL somehow.
+
 int32_t TestTCPSocketPrivate::ReadFirstLineFromSocket(
     pp::TCPSocketPrivate* socket,
     std::string* s) {