OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/http/http_proxy_client_socket_pool.h" | 5 #include "net/http/http_proxy_client_socket_pool.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
471 arraysize(spdy_writes)); | 471 arraysize(spdy_writes)); |
472 AddAuthToCache(); | 472 AddAuthToCache(); |
473 | 473 |
474 int rv = handle_.Init("a", GetTunnelParams(), LOW, callback_.callback(), | 474 int rv = handle_.Init("a", GetTunnelParams(), LOW, callback_.callback(), |
475 &pool_, BoundNetLog()); | 475 &pool_, BoundNetLog()); |
476 EXPECT_EQ(ERR_IO_PENDING, rv); | 476 EXPECT_EQ(ERR_IO_PENDING, rv); |
477 EXPECT_FALSE(handle_.is_initialized()); | 477 EXPECT_FALSE(handle_.is_initialized()); |
478 EXPECT_FALSE(handle_.socket()); | 478 EXPECT_FALSE(handle_.socket()); |
479 | 479 |
480 data_->RunFor(3); | 480 data_->RunFor(3); |
481 EXPECT_EQ(ERR_CONNECTION_CLOSED, callback_.WaitForResult()); | 481 if (GetParam() == SPDY) { |
| 482 // SPDY cannot process a headers block unless it's complete and so it |
| 483 // returns ERR_CONNECTION_CLOSED in this case. |
| 484 EXPECT_EQ(ERR_CONNECTION_CLOSED, callback_.WaitForResult()); |
| 485 } else { |
| 486 EXPECT_EQ(ERR_HEADERS_TRUNCATED, callback_.WaitForResult()); |
| 487 } |
482 EXPECT_FALSE(handle_.is_initialized()); | 488 EXPECT_FALSE(handle_.is_initialized()); |
483 EXPECT_FALSE(handle_.socket()); | 489 EXPECT_FALSE(handle_.socket()); |
484 } | 490 } |
485 | 491 |
486 TEST_P(HttpProxyClientSocketPoolSpdy2Test, TunnelSetupError) { | 492 TEST_P(HttpProxyClientSocketPoolSpdy2Test, TunnelSetupError) { |
487 MockWrite writes[] = { | 493 MockWrite writes[] = { |
488 MockWrite(ASYNC, 0, | 494 MockWrite(ASYNC, 0, |
489 "CONNECT www.google.com:443 HTTP/1.1\r\n" | 495 "CONNECT www.google.com:443 HTTP/1.1\r\n" |
490 "Host: www.google.com\r\n" | 496 "Host: www.google.com\r\n" |
491 "Proxy-Connection: keep-alive\r\n" | 497 "Proxy-Connection: keep-alive\r\n" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
608 // Make sure Location header was included and correct. | 614 // Make sure Location header was included and correct. |
609 std::string location; | 615 std::string location; |
610 EXPECT_TRUE(headers->IsRedirect(&location)); | 616 EXPECT_TRUE(headers->IsRedirect(&location)); |
611 EXPECT_EQ(location, redirectTarget); | 617 EXPECT_EQ(location, redirectTarget); |
612 } | 618 } |
613 } | 619 } |
614 | 620 |
615 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. | 621 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. |
616 | 622 |
617 } // namespace net | 623 } // namespace net |
OLD | NEW |