Get tests working for Alternate-Protocol and proxies.
Fixed some bugs along the way.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46509 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index d0edafa..063460d 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1105,7 +1105,7 @@
         next_state_ = STATE_SSL_CONNECT;
         // Reset for the real request and response headers.
         request_headers_.clear();
-        http_stream_.reset(new HttpBasicStream(connection_.get(), net_log_));
+        http_stream_.reset(NULL);
         headers_valid_ = false;
         establishing_tunnel_ = false;
         // TODO(mbelshe): We should put in a test case to trip this code path.