net/http/http_stream_factory_impl_unittest.cc - Issue 23856018: Changes to HttpNetworkTransaction for WebSocket Handshake

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 23856018: Changes to HttpNetworkTransaction for WebSocket Handshake (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add tests by yhirano Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/http/http_stream_factory_impl_unittest.cc

diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc

index 0cf9e6966c2bb301277e7f43fa012aeae0d1c2bf..92feaed989aea66090f7df83333f01ecf709f685 100644

--- a/net/http/http_stream_factory_impl_unittest.cc

+++ b/net/http/http_stream_factory_impl_unittest.cc

@@ -272,9 +272,10 @@ class WebSocketBasicHandshakeStream : public MockWebSocketHandshakeStream {

scoped_ptr<ClientSocketHandle> connection_;

};

-class WebSocketStreamFactory : public WebSocketHandshakeStreamBase::Factory {

+class WebSocketHandshakeStreamFactory

+ : public WebSocketHandshakeStreamBase::Factory {

public:

- virtual ~WebSocketStreamFactory() {}

+ virtual ~WebSocketHandshakeStreamFactory() {}

virtual WebSocketHandshakeStreamBase* CreateBasicStream(

ClientSocketHandle* connection,

@@ -930,7 +931,7 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStream) {

SSLConfig ssl_config;

StreamRequestWaiter waiter;

- WebSocketStreamFactory factory;

+ WebSocketHandshakeStreamFactory factory;

scoped_ptr<HttpStreamRequest> request(

session->websocket_handshake_stream_factory()

->RequestWebSocketHandshakeStream(request_info,

@@ -981,7 +982,7 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverSSL) {

SSLConfig ssl_config;

StreamRequestWaiter waiter;

- WebSocketStreamFactory factory;

+ WebSocketHandshakeStreamFactory factory;

scoped_ptr<HttpStreamRequest> request(

session->websocket_handshake_stream_factory()

->RequestWebSocketHandshakeStream(request_info,

@@ -1029,7 +1030,7 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketBasicHandshakeStreamOverProxy) {

SSLConfig ssl_config;

StreamRequestWaiter waiter;

- WebSocketStreamFactory factory;

+ WebSocketHandshakeStreamFactory factory;

scoped_ptr<HttpStreamRequest> request(

session->websocket_handshake_stream_factory()

->RequestWebSocketHandshakeStream(request_info,

@@ -1143,7 +1144,7 @@ TEST_P(HttpStreamFactoryTest, RequestWebSocketSpdyHandshakeStream) {

SSLConfig ssl_config;

StreamRequestWaiter waiter1;

- WebSocketStreamFactory factory;

+ WebSocketHandshakeStreamFactory factory;

scoped_ptr<HttpStreamRequest> request1(

session->websocket_handshake_stream_factory()

->RequestWebSocketHandshakeStream(request_info,

@@ -1233,7 +1234,7 @@ TEST_P(HttpStreamFactoryTest, OrphanedWebSocketStream) {

SSLConfig ssl_config;

StreamRequestWaiter waiter;

- WebSocketStreamFactory factory;

+ WebSocketHandshakeStreamFactory factory;

scoped_ptr<HttpStreamRequest> request(

session->websocket_handshake_stream_factory()

->RequestWebSocketHandshakeStream(request_info,

« net/http/http_network_transaction.cc ('K') | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_transaction.h » ('j') | no next file with comments »