Rename WebSocketStreamBase to WebSocketHandshakeStreamBase in order to better reflect its new function.

This name change previously was done in CL
https://codereview.chromium.org/25417005/ but it caused numerous merge
conflicts. So it has been split out into this CL.

Also add an Upgrade() method which produces a WebSocketStream from a
WebSocketHandshakeStreamBase. This is for use inside the implementation of
WebSocketStream::CreateAndConnectStream().

BUG=312515

Review URL: https://codereview.chromium.org/49043009

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

1 files changed, 3 insertions, 3 deletions

diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 20e23a0..5d0a7b9 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -140,8 +140,8 @@ class NET_EXPORT HttpNetworkSession
   HttpStreamFactory* http_stream_factory() {
     return http_stream_factory_.get();
   }
-  HttpStreamFactory* websocket_stream_factory() {
-    return websocket_stream_factory_.get();
+  HttpStreamFactory* websocket_handshake_stream_factory() {
+    return websocket_handshake_stream_factory_.get();
   }
   NetLog* net_log() {
     return net_log_;
@@ -197,7 +197,7 @@ class NET_EXPORT HttpNetworkSession
   QuicStreamFactory quic_stream_factory_;
   SpdySessionPool spdy_session_pool_;
   scoped_ptr<HttpStreamFactory> http_stream_factory_;
-  scoped_ptr<HttpStreamFactory> websocket_stream_factory_;
+  scoped_ptr<HttpStreamFactory> websocket_handshake_stream_factory_;
   std::set<HttpResponseBodyDrainer*> response_drainers_;
 
   Params params_;