Revert 91292 - Refactoring on SocketStream to support IO PENDING on WebSocket throttling

and SPDY streams per session limitation.

BUG=42320
TEST=net_unittests --gtest_filter=SocketStreamTest\*


Review URL: http://codereview.chromium.org/7294022

TBR=toyoshim@chromium.org
Review URL: http://codereview.chromium.org/7298011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91296 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 41 deletions

diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index 4c5b13a..b49a6a1 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -234,10 +234,6 @@ void SocketStream::DetachDelegate() {
   Close();
 }
 
-const ProxyServer& SocketStream::proxy_server() const {
-  return proxy_info_.proxy_server();
-}
-
 void SocketStream::SetHostResolver(HostResolver* host_resolver) {
   DCHECK(host_resolver);
   host_resolver_ = host_resolver;
@@ -405,12 +401,6 @@ void SocketStream::DoLoop(int result) {
       case STATE_RESOLVE_HOST_COMPLETE:
         result = DoResolveHostComplete(result);
         break;
-      case STATE_RESOLVE_PROTOCOL:
-        result = DoResolveProtocol(result);
-        break;
-      case STATE_RESOLVE_PROTOCOL_COMPLETE:
-        result = DoResolveProtocolComplete(result);
-        break;
       case STATE_TCP_CONNECT:
         result = DoTcpConnect(result);
         break;
@@ -462,8 +452,6 @@ void SocketStream::DoLoop(int result) {
         Finish(result);
         return;
     }
-    if (state == STATE_RESOLVE_PROTOCOL && result == ERR_PROTOCOL_SWITCHED)
-      continue;
     // If the connection is not established yet and had actual errors,
     // close the connection.
     if (state != STATE_READ_WRITE && result < ERR_IO_PENDING) {
@@ -557,40 +545,28 @@ int SocketStream::DoResolveHost() {
 }
 
 int SocketStream::DoResolveHostComplete(int result) {
-  if (result == OK && delegate_)
-    next_state_ = STATE_RESOLVE_PROTOCOL;
-  else
+  if (result == OK && delegate_) {
+    result = delegate_->OnStartOpenConnection(this, &io_callback_);
+    if (result == ERR_PROTOCOL_SWITCHED) {
+      next_state_ = STATE_CLOSE;
+      metrics_->OnCountWireProtocolType(
+          SocketStreamMetrics::WIRE_PROTOCOL_SPDY);
+    } else {
+      next_state_ = STATE_TCP_CONNECT;
+      metrics_->OnCountWireProtocolType(
+          SocketStreamMetrics::WIRE_PROTOCOL_WEBSOCKET);
+      if (result == ERR_IO_PENDING)
+        metrics_->OnWaitConnection();
+    }
+  } else {
     next_state_ = STATE_CLOSE;
+  }
   // TODO(ukai): if error occured, reconsider proxy after error.
   return result;
 }
 
-int SocketStream::DoResolveProtocol(int result) {
-  DCHECK_EQ(OK, result);
-  next_state_ = STATE_RESOLVE_PROTOCOL_COMPLETE;
-  result = delegate_->OnStartOpenConnection(this, &io_callback_);
-  if (result == ERR_IO_PENDING)
-    metrics_->OnWaitConnection();
-  else if (result != OK && result != ERR_PROTOCOL_SWITCHED)
-    next_state_ = STATE_CLOSE;
-  return result;
-}
-
-int SocketStream::DoResolveProtocolComplete(int result) {
-  DCHECK_NE(ERR_IO_PENDING, result);
-
-  if (result == ERR_PROTOCOL_SWITCHED) {
-    next_state_ = STATE_CLOSE;
-    metrics_->OnCountWireProtocolType(
-        SocketStreamMetrics::WIRE_PROTOCOL_SPDY);
-  } else if (result == OK) {
-    next_state_ = STATE_TCP_CONNECT;
-    metrics_->OnCountWireProtocolType(
-        SocketStreamMetrics::WIRE_PROTOCOL_WEBSOCKET);
-  } else {
-    next_state_ = STATE_CLOSE;
-  }
-  return result;
+const ProxyServer& SocketStream::proxy_server() const {
+  return proxy_info_.proxy_server();
 }
 
 int SocketStream::DoTcpConnect(int result) {