Revert 61897 - Do not use Alternate-Protocol for establishing new SpdySessions.

Only use Alternate-Protocol for latching onto existing SpdySessions.
This is a temporary change until SSL improvements are made, so we
can begin sending http over spdy when available.

Note that we have to do proxy resolution one time to figure out how to check for the appropriate existing SpdySession.  If no SpdySession exists, we fallback again and have to redo proxy resolution (since the alternate protocol of npn-spdy requires rewriting the URI from http:// to https://).  So we may end up doing two proxy resolutions in the fallback case.

I had to disable all the tests that test establishing a new
SpdySession for http:// URIs, since we don't do that for now.

BUG=none
TEST=none

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

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/3751009

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

1 files changed, 1 insertions, 12 deletions

diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc
index abf1e4c..2409d86 100644
--- a/net/http/http_stream_request.cc
+++ b/net/http/http_stream_request.cc
@@ -412,18 +412,7 @@ int HttpStreamRequest::DoResolveProxyComplete(int result) {
     return ERR_NO_SUPPORTED_PROXIES;
   }
 
-  HostPortProxyPair pair(endpoint_, proxy_info()->proxy_server());
-  if (!HttpStreamFactory::create_new_spdy_session_for_http() &&
-      alternate_protocol_mode_ == kUsingAlternateProtocol &&
-      !session_->spdy_session_pool()->HasSession(pair)) {
-    // If we don't already have a SpdySession, then don't pay the SSL handshake
-    // cost of setup.  Just use HTTP.
-    next_state_ = STATE_RESOLVE_PROXY;
-    alternate_protocol_mode_ = kDoNotUseAlternateProtocol;
-  } else {
-    next_state_ = STATE_INIT_CONNECTION;
-  }
-
+  next_state_ = STATE_INIT_CONNECTION;
   return OK;
 }