| 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/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 HttpProxyClientSocketPoolTest, | 341 HttpProxyClientSocketPoolTest, |
| 342 ::testing::Values( | 342 ::testing::Values( |
| 343 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY31), | 343 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY31), |
| 344 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY31), | 344 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY31), |
| 345 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY31), | 345 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY31), |
| 346 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_14), | 346 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_14), |
| 347 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_14), | 347 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_14), |
| 348 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_14), | 348 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_14), |
| 349 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_15), | 349 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4_15), |
| 350 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_15), | 350 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4_15), |
| 351 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_15))); | 351 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4_15), |
| 352 HttpProxyClientSocketPoolTestParams(HTTP, kProtoSPDY4), |
| 353 HttpProxyClientSocketPoolTestParams(HTTPS, kProtoSPDY4), |
| 354 HttpProxyClientSocketPoolTestParams(SPDY, kProtoSPDY4))); |
| 352 | 355 |
| 353 TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) { | 356 TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) { |
| 354 Initialize(NULL, 0, NULL, 0, NULL, 0, NULL, 0); | 357 Initialize(NULL, 0, NULL, 0, NULL, 0, NULL, 0); |
| 355 | 358 |
| 356 scoped_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate()); | 359 scoped_ptr<TestProxyDelegate> proxy_delegate(new TestProxyDelegate()); |
| 357 int rv = handle_.Init("a", CreateNoTunnelParams(proxy_delegate.get()), LOW, | 360 int rv = handle_.Init("a", CreateNoTunnelParams(proxy_delegate.get()), LOW, |
| 358 CompletionCallback(), &pool_, BoundNetLog()); | 361 CompletionCallback(), &pool_, BoundNetLog()); |
| 359 EXPECT_EQ(OK, rv); | 362 EXPECT_EQ(OK, rv); |
| 360 EXPECT_TRUE(handle_.is_initialized()); | 363 EXPECT_TRUE(handle_.is_initialized()); |
| 361 ASSERT_TRUE(handle_.socket()); | 364 ASSERT_TRUE(handle_.socket()); |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 841 EXPECT_TRUE(headers->IsRedirect(&location)); | 844 EXPECT_TRUE(headers->IsRedirect(&location)); |
| 842 EXPECT_EQ(location, redirectTarget); | 845 EXPECT_EQ(location, redirectTarget); |
| 843 } | 846 } |
| 844 } | 847 } |
| 845 | 848 |
| 846 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. | 849 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. |
| 847 | 850 |
| 848 } // namespace | 851 } // namespace |
| 849 | 852 |
| 850 } // namespace net | 853 } // namespace net |
| OLD | NEW |