| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/spdy/spdy_test_util_common.h" | 5 #include "net/spdy/spdy_test_util_common.h" |
| 6 | 6 |
| 7 #include <cstddef> | 7 #include <cstddef> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 base::WeakPtr<SpdySession> CreateSpdySessionHelper( | 516 base::WeakPtr<SpdySession> CreateSpdySessionHelper( |
| 517 const scoped_refptr<HttpNetworkSession>& http_session, | 517 const scoped_refptr<HttpNetworkSession>& http_session, |
| 518 const SpdySessionKey& key, | 518 const SpdySessionKey& key, |
| 519 const BoundNetLog& net_log, | 519 const BoundNetLog& net_log, |
| 520 Error expected_status, | 520 Error expected_status, |
| 521 bool is_secure) { | 521 bool is_secure) { |
| 522 EXPECT_FALSE(HasSpdySession(http_session->spdy_session_pool(), key)); | 522 EXPECT_FALSE(HasSpdySession(http_session->spdy_session_pool(), key)); |
| 523 | 523 |
| 524 scoped_refptr<TransportSocketParams> transport_params( | 524 scoped_refptr<TransportSocketParams> transport_params( |
| 525 new TransportSocketParams( | 525 new TransportSocketParams( |
| 526 key.host_port_pair(), false, false, | 526 key.host_port_pair(), false, false, OnHostResolutionCallback(), |
| 527 OnHostResolutionCallback())); | 527 TransportSocketParams::COMBINE_CONNECT_AND_WRITE_DEFAULT)); |
| 528 | 528 |
| 529 scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); | 529 scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle); |
| 530 TestCompletionCallback callback; | 530 TestCompletionCallback callback; |
| 531 | 531 |
| 532 int rv = ERR_UNEXPECTED; | 532 int rv = ERR_UNEXPECTED; |
| 533 if (is_secure) { | 533 if (is_secure) { |
| 534 SSLConfig ssl_config; | 534 SSLConfig ssl_config; |
| 535 scoped_refptr<SSLSocketParams> ssl_params( | 535 scoped_refptr<SSLSocketParams> ssl_params( |
| 536 new SSLSocketParams(transport_params, | 536 new SSLSocketParams(transport_params, |
| 537 NULL, | 537 NULL, |
| (...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1314 } | 1314 } |
| 1315 } | 1315 } |
| 1316 | 1316 |
| 1317 void SpdyTestUtil::SetPriority(RequestPriority priority, | 1317 void SpdyTestUtil::SetPriority(RequestPriority priority, |
| 1318 SpdySynStreamIR* ir) const { | 1318 SpdySynStreamIR* ir) const { |
| 1319 ir->set_priority(ConvertRequestPriorityToSpdyPriority( | 1319 ir->set_priority(ConvertRequestPriorityToSpdyPriority( |
| 1320 priority, spdy_version())); | 1320 priority, spdy_version())); |
| 1321 } | 1321 } |
| 1322 | 1322 |
| 1323 } // namespace net | 1323 } // namespace net |
| OLD | NEW |