diff options
author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 09:27:52 +0000 |
---|---|---|
committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 09:27:52 +0000 |
commit | 2b66578eacc410f4a7e75b7668d75fb6907c24e6 (patch) | |
tree | ea76e5360b0eedc8b9904796fd7adc71303727fe /net/socket_stream/socket_stream_unittest.cc | |
parent | aac499059df9f32e6b3ee691c17a4b6e6be3415b (diff) | |
download | chromium_src-2b66578eacc410f4a7e75b7668d75fb6907c24e6.zip chromium_src-2b66578eacc410f4a7e75b7668d75fb6907c24e6.tar.gz chromium_src-2b66578eacc410f4a7e75b7668d75fb6907c24e6.tar.bz2 |
Revert 93860 - secure proxy support in websocket
BUG=83950
TEST=net_unittest --gtest_filter=SocketStreamTest.* pass
Review URL: http://codereview.chromium.org/7468025
TBR=ukai@chromium.org
Review URL: http://codereview.chromium.org/7489039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream/socket_stream_unittest.cc')
-rw-r--r-- | net/socket_stream/socket_stream_unittest.cc | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index 80bff3c..090ecff 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -535,109 +535,4 @@ TEST_F(SocketStreamTest, SwitchAfterPending) { EXPECT_EQ(net::ERR_PROTOCOL_SWITCHED, events[1].error_code); } -// Test a connection though a secure proxy. -TEST_F(SocketStreamTest, SecureProxyConnectError) { - MockClientSocketFactory mock_socket_factory; - MockWrite data_writes[] = { - MockWrite("CONNECT example.com:80 HTTP/1.1\r\n" - "Host: example.com\r\n" - "Proxy-Connection: keep-alive\r\n\r\n") - }; - MockRead data_reads[] = { - MockRead("HTTP/1.1 200 Connection Established\r\n"), - MockRead("Proxy-agent: Apache/2.2.8\r\n"), - MockRead("\r\n"), - // SocketStream::DoClose is run asynchronously. Socket can be read after - // "\r\n". We have to give ERR_IO_PENDING to SocketStream then to indicate - // server doesn't close the connection. - MockRead(true, ERR_IO_PENDING) - }; - StaticSocketDataProvider data(data_reads, arraysize(data_reads), - data_writes, arraysize(data_writes)); - mock_socket_factory.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, ERR_SSL_PROTOCOL_ERROR); - mock_socket_factory.AddSSLSocketDataProvider(&ssl); - - TestCompletionCallback callback; - - scoped_ptr<SocketStreamEventRecorder> delegate( - new SocketStreamEventRecorder(&callback)); - delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose, - base::Unretained(delegate.get()))); - - scoped_refptr<SocketStream> socket_stream( - new SocketStream(GURL("ws://example.com/demo"), delegate.get())); - - socket_stream->set_context(new TestURLRequestContext("https://myproxy:70")); - MockHostResolver host_resolver; - socket_stream->SetHostResolver(&host_resolver); - socket_stream->SetClientSocketFactory(&mock_socket_factory); - - socket_stream->Connect(); - - callback.WaitForResult(); - - const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents(); - ASSERT_EQ(3U, events.size()); - - EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION, - events[0].event_type); - EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[1].event_type); - EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, events[1].error_code); - EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type); -} - -// Test a connection though a secure proxy. -TEST_F(SocketStreamTest, SecureProxyConnect) { - MockClientSocketFactory mock_socket_factory; - MockWrite data_writes[] = { - MockWrite("CONNECT example.com:80 HTTP/1.1\r\n" - "Host: example.com\r\n" - "Proxy-Connection: keep-alive\r\n\r\n") - }; - MockRead data_reads[] = { - MockRead("HTTP/1.1 200 Connection Established\r\n"), - MockRead("Proxy-agent: Apache/2.2.8\r\n"), - MockRead("\r\n"), - // SocketStream::DoClose is run asynchronously. Socket can be read after - // "\r\n". We have to give ERR_IO_PENDING to SocketStream then to indicate - // server doesn't close the connection. - MockRead(true, ERR_IO_PENDING) - }; - StaticSocketDataProvider data(data_reads, arraysize(data_reads), - data_writes, arraysize(data_writes)); - mock_socket_factory.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); - mock_socket_factory.AddSSLSocketDataProvider(&ssl); - - TestCompletionCallback callback; - - scoped_ptr<SocketStreamEventRecorder> delegate( - new SocketStreamEventRecorder(&callback)); - delegate->SetOnConnected(base::Bind(&SocketStreamEventRecorder::DoClose, - base::Unretained(delegate.get()))); - - scoped_refptr<SocketStream> socket_stream( - new SocketStream(GURL("ws://example.com/demo"), delegate.get())); - - socket_stream->set_context(new TestURLRequestContext("https://myproxy:70")); - MockHostResolver host_resolver; - socket_stream->SetHostResolver(&host_resolver); - socket_stream->SetClientSocketFactory(&mock_socket_factory); - - socket_stream->Connect(); - - callback.WaitForResult(); - - const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents(); - ASSERT_EQ(4U, events.size()); - - EXPECT_EQ(SocketStreamEvent::EVENT_START_OPEN_CONNECTION, - events[0].event_type); - EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type); - EXPECT_EQ(SocketStreamEvent::EVENT_ERROR, events[2].event_type); - EXPECT_EQ(net::ERR_ABORTED, events[2].error_code); - EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[3].event_type); -} - } // namespace net |