Minor fixes in SocketStream.

net/socket_stream/socket_stream.cc

 // Copyright (c) 2009 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.
 //
 // TODO(ukai): code is similar with http_network_transaction.cc.  We should
 //   think about ways to share code, if possible.
 
 #include "net/socket_stream/socket_stream.h"
 
 #include <string>
@@ skipping 620 matching lines @@
   return socket_->Connect(&io_callback_, NULL);
 }
 
 int SocketStream::DoSOCKSConnectComplete(int result) {
   DCHECK_EQ(kSOCKSProxy, proxy_mode_);
 
   if (result == OK) {
     if (is_secure())
       next_state_ = STATE_SSL_CONNECT;
     else
-      DidEstablishConnection();
+      result = DidEstablishConnection();
   }
   return result;
 }
 
 int SocketStream::DoSSLConnect() {
   DCHECK(factory_);
   socket_.reset(factory_->CreateSSLClientSocket(
       socket_.release(), url_.HostNoBrackets(), ssl_config_));
   next_state_ = STATE_SSL_CONNECT_COMPLETE;
   // TODO(willchan): Plumb LoadLog into SocketStream.
@@ skipping 29 matching lines @@
     result = socket_->Read(read_buf_, kReadBufferSize, &read_callback_);
     if (result > 0) {
       DidReceiveData(result);
       return OK;
     } else if (result == 0) {
       // 0 indicates end-of-file, so socket was closed.
       next_state_ = STATE_CLOSE;
       return ERR_CONNECTION_CLOSED;
     }
     // If read is pending, try write as well.
-    // Otherwise, return the result and do next loop.
+    // Otherwise, return the result and do next loop (to close the connection).
     if (result != ERR_IO_PENDING) {
       next_state_ = STATE_CLOSE;
       return result;
     }
   }
   // Read is pending.
   DCHECK(read_buf_);
 
   if (write_buf_ && !current_write_buf_) {
     // No write pending.
     current_write_buf_ = new DrainableIOBuffer(write_buf_, write_buf_size_);
     current_write_buf_->SetOffset(write_buf_offset_);
     result = socket_->Write(current_write_buf_,
                             current_write_buf_->BytesRemaining(),
                             &write_callback_);
     if (result > 0) {
       DidSendData(result);
       return OK;
     }
+    // If write is not pending, return the result and do next loop (to close
+    // the connection).
+    if (result != 0 && result != ERR_IO_PENDING) {
+      next_state_ = STATE_CLOSE;
+      return result;
+    }
     return result;
   }
 
   // We arrived here when both operation is pending.
   return ERR_IO_PENDING;
 }
 
 GURL SocketStream::ProxyAuthOrigin() const {
   return GURL("http://" + proxy_info_.proxy_server().host_and_port());
 }
@@ skipping 88 matching lines @@
 
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
 
 ProxyService* SocketStream::proxy_service() const {
   return context_->proxy_service();
 }
 
 }  // namespace net