| Index: chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
|
| diff --git a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
|
| index 2b8b0cf27c77296e42034c16f1b475ff9cca1fc1..08cf8c863808a46b14dd79ed352b50eb2d2319a5 100755
|
| --- a/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
|
| +++ b/chrome/browser/sync/notifier/communicator/ssl_socket_adapter.cc
|
| @@ -79,7 +79,7 @@ int SSLSocketAdapter::StartSSL(const char* hostname, bool restartable) {
|
| net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
|
| socket_, hostname, ssl_config));
|
|
|
| - int result = ssl_socket_->Connect(&connected_callback_);
|
| + int result = ssl_socket_->Connect(&connected_callback_, NULL);
|
|
|
| if (result == net::ERR_IO_PENDING || result == net::OK) {
|
| return 0;
|
| @@ -197,7 +197,8 @@ TransportSocket::TransportSocket(talk_base::AsyncSocket* socket,
|
| socket_->SignalConnectEvent.connect(this, &TransportSocket::OnConnectEvent);
|
| }
|
|
|
| -int TransportSocket::Connect(net::CompletionCallback* callback) {
|
| +int TransportSocket::Connect(net::CompletionCallback* callback,
|
| + net::LoadLog* /* load_log */) {
|
| connect_callback_ = callback;
|
| return socket_->Connect(addr_);
|
| }
|
|
|