diff options
author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 23:35:38 +0000 |
---|---|---|
committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 23:35:38 +0000 |
commit | 3971e254d01cc6c904b9fe724faca6810578b0c8 (patch) | |
tree | 6f18b78ad7970df7f458bedd903853685de40935 /net/http/http_network_transaction_unittest.cc | |
parent | 8dfe9a09ec348ae0e552534f03d5fbae868a7915 (diff) | |
download | chromium_src-3971e254d01cc6c904b9fe724faca6810578b0c8.zip chromium_src-3971e254d01cc6c904b9fe724faca6810578b0c8.tar.gz chromium_src-3971e254d01cc6c904b9fe724faca6810578b0c8.tar.bz2 |
Revert 11484 to try to heal plugin_test failure
tbr=abarth
Review URL: http://codereview.chromium.org/42101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_network_transaction_unittest.cc')
-rw-r--r-- | net/http/http_network_transaction_unittest.cc | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 337f6c7..e73fc45 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -1159,65 +1159,6 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) { EXPECT_EQ(L"basic", response->auth_challenge->scheme); } -// Test that we don't read the response body when we fail to establish a tunnel, -// even if the user cancels the proxy's auth attempt. -TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) { - // Configure against proxy server "myproxy:70". - scoped_ptr<net::ProxyService> proxy_service( - CreateFixedProxyService("myproxy:70")); - - scoped_refptr<net::HttpNetworkSession> session( - CreateSession(proxy_service.get())); - - scoped_ptr<net::HttpTransaction> trans(new net::HttpNetworkTransaction( - session.get(), &mock_socket_factory)); - - net::HttpRequestInfo request; - request.method = "GET"; - request.url = GURL("https://www.google.com/"); - request.load_flags = 0; - - // Since we have proxy, should try to establish tunnel. - MockWrite data_writes[] = { - MockWrite("CONNECT www.google.com:443 HTTP/1.1\r\n" - "Host: www.google.com\r\n\r\n"), - }; - - // The proxy responds to the connect with a 407. - MockRead data_reads[] = { - MockRead("HTTP/1.1 407 Proxy Authentication Required\r\n"), - MockRead("Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"), - MockRead("Content-Length: 10\r\n\r\n"), - MockRead(false, net::ERR_UNEXPECTED), // Should not be reached. - }; - - MockSocket data; - data.writes = data_writes; - data.reads = data_reads; - mock_sockets[0] = &data; - mock_sockets[1] = NULL; - - TestCompletionCallback callback; - - int rv = trans->Start(&request, &callback); - EXPECT_EQ(net::ERR_IO_PENDING, rv); - - rv = callback.WaitForResult(); - EXPECT_EQ(net::OK, rv); - - const net::HttpResponseInfo* response = trans->GetResponseInfo(); - EXPECT_FALSE(response == NULL); - - EXPECT_TRUE(response->headers->IsKeepAlive()); - EXPECT_EQ(407, response->headers->response_code()); - EXPECT_EQ(10, response->headers->GetContentLength()); - EXPECT_TRUE(net::HttpVersion(1, 1) == response->headers->GetHttpVersion()); - - std::string response_data; - rv = ReadTransaction(trans.get(), &response_data); - EXPECT_EQ(net::ERR_TUNNEL_CONNECTION_FAILED, rv); -} - static void ConnectStatusHelperWithExpectedStatus( const MockRead& status, int expected_status) { // Configure against proxy server "myproxy:70". |