diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:55:35 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:55:35 +0000 |
commit | 3bb000e4753dd4148cc4c247de5db55c5c5417b4 (patch) | |
tree | 1d8e4463177aa65d934356c5204b887b07052c51 | |
parent | efe22215cad3c4541a443339d948c226d54e44c5 (diff) | |
download | chromium_src-3bb000e4753dd4148cc4c247de5db55c5c5417b4.zip chromium_src-3bb000e4753dd4148cc4c247de5db55c5c5417b4.tar.gz chromium_src-3bb000e4753dd4148cc4c247de5db55c5c5417b4.tar.bz2 |
Fix ChromeOS build
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144469 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/chromeos/web_socket_proxy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 28d14f1..bfdbcb4 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -618,7 +618,7 @@ class SSLChan : public MessageLoopForIO::Watcher { cert_verifier_.reset(net::CertVerifier::CreateDefault()); ssl_context.cert_verifier = cert_verifier_.get(); socket_.reset(factory->CreateSSLClientSocket( - handle, host_port_pair_, ssl_config_, NULL, ssl_context)); + handle, host_port_pair_, ssl_config_, ssl_context)); if (!socket_.get()) { LOG(WARNING) << "Failed to create an SSL client socket."; OnSSLHandshakeCompleted(net::ERR_UNEXPECTED); |