Revert 271343 "Build remoting for PNaCl"

trunk/src/remoting/protocol/ssl_hmac_channel_authenticator.cc

Index: trunk/src/remoting/protocol/ssl_hmac_channel_authenticator.cc
===================================================================
--- trunk/src/remoting/protocol/ssl_hmac_channel_authenticator.cc	(revision 271343)
+++ trunk/src/remoting/protocol/ssl_hmac_channel_authenticator.cc	(working copy)
@@ -15,7 +15,6 @@
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
-#include "net/socket/ssl_client_socket_openssl.h"
 #include "net/socket/ssl_server_socket.h"
 #include "net/ssl/ssl_config_service.h"
 #include "remoting/base/rsa_key_pair.h"
@@ -64,12 +63,6 @@
 
   int result;
   if (is_ssl_server()) {
-#if defined(OS_NACL)
-    // Client plugin doesn't use server SSL sockets, and so SSLServerSocket
-    // implementation is not compiled for NaCl as part of net_nacl.
-    NOTREACHED();
-    result = net::ERR_FAILED;
-#else
     scoped_refptr<net::X509Certificate> cert =
         net::X509Certificate::CreateFromBytes(
             local_cert_.data(), local_cert_.length());
@@ -92,7 +85,6 @@
     result = raw_server_socket->Handshake(
         base::Bind(&SslHmacChannelAuthenticator::OnConnected,
                    base::Unretained(this)));
-#endif
   } else {
     transport_security_state_.reset(new net::TransportSecurityState);
 
@@ -112,19 +104,11 @@
     net::HostPortPair host_and_port(kSslFakeHostName, 0);
     net::SSLClientSocketContext context;
     context.transport_security_state = transport_security_state_.get();
-    scoped_ptr<net::ClientSocketHandle> socket_handle(
-        new net::ClientSocketHandle);
-    socket_handle->SetSocket(socket.Pass());
-
-#if defined(OS_NACL)
-    // net_nacl doesn't include ClientSocketFactory.
-    socket_.reset(new net::SSLClientSocketOpenSSL(
-        socket_handle.Pass(), host_and_port, ssl_config, context));
-#else
+    scoped_ptr<net::ClientSocketHandle> connection(new net::ClientSocketHandle);
+    connection->SetSocket(socket.Pass());
     socket_ =
         net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
-            socket_handle.Pass(), host_and_port, ssl_config, context);
-#endif
+            connection.Pass(), host_and_port, ssl_config, context);
 
     result = socket_->Connect(
         base::Bind(&SslHmacChannelAuthenticator::OnConnected,