Don't use X509Certificate in SSLConfig.

remoting/protocol/jingle_stream_connector.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/jingle_stream_connector.h"
 
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/cert_verifier.h"
@@ skipping 10 matching lines @@
 namespace protocol {
 
 namespace {
 
 // Value is choosen to balance the extra latency against the reduced
 // load due to ACK traffic.
 const int kTcpAckDelayMilliseconds = 10;
 
 // Helper method to create a SSL client socket.
 net::SSLClientSocket* CreateSSLClientSocket(
-    net::StreamSocket* socket, const std::string& cert_der,
+    net::StreamSocket* socket, const std::string& der_cert,
     net::CertVerifier* cert_verifier) {
   net::SSLConfig ssl_config;
 
   // Certificate provided by the host doesn't need authority.
   net::SSLConfig::CertAndStatus cert_and_status;
   cert_and_status.cert_status = net::CERT_STATUS_AUTHORITY_INVALID;
-  cert_and_status.cert = net::X509Certificate::CreateFromBytes(
-      cert_der.data(), cert_der.length());
+  cert_and_status.der_cert = der_cert;
   ssl_config.allowed_bad_certs.push_back(cert_and_status);
 
   // SSLClientSocket takes ownership of the adapter.
   net::HostPortPair host_and_pair(JingleSession::kChromotingContentName, 0);
   net::SSLClientSocket* ssl_socket =
       net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
           socket, host_and_pair, ssl_config, NULL, cert_verifier);
   return ssl_socket;
 }
 
@@ skipping 139 matching lines @@
 }
 
 void JingleStreamConnector::NotifyError() {
   socket_.reset();
   callback_.Run(name_, NULL);
   session_->OnChannelConnectorFinished(name_, this);
 }
 
 }  // namespace protocol
 }  // namespace remoting