Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Side by Side Diff: net/spdy/spdy_proxy_client_socket_unittest.cc

Issue 25977005: [SPDY] Do not advertise SPDY/2 by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/spdy/spdy_proxy_client_socket.h" 5 #include "net/spdy/spdy_proxy_client_socket.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "net/base/address_list.h" 10 #include "net/base/address_list.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 HostPortPair endpoint_host_port_pair_; 133 HostPortPair endpoint_host_port_pair_;
134 ProxyServer proxy_; 134 ProxyServer proxy_;
135 SpdySessionKey endpoint_spdy_session_key_; 135 SpdySessionKey endpoint_spdy_session_key_;
136 136
137 DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest); 137 DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest);
138 }; 138 };
139 139
140 INSTANTIATE_TEST_CASE_P( 140 INSTANTIATE_TEST_CASE_P(
141 NextProto, 141 NextProto,
142 SpdyProxyClientSocketTest, 142 SpdyProxyClientSocketTest,
143 testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2, 143 testing::Values(kProtoDeprecatedSPDY2,
144 kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2,
144 kProtoHTTP2Draft04)); 145 kProtoHTTP2Draft04));
145 146
146 SpdyProxyClientSocketTest::SpdyProxyClientSocketTest() 147 SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
147 : spdy_util_(GetParam()), 148 : spdy_util_(GetParam()),
148 session_(NULL), 149 session_(NULL),
149 read_buf_(NULL), 150 read_buf_(NULL),
150 session_deps_(GetParam()), 151 session_deps_(GetParam()),
151 connect_data_(SYNCHRONOUS, OK), 152 connect_data_(SYNCHRONOUS, OK),
152 framer_(spdy_util_.spdy_version(), false), 153 framer_(spdy_util_.spdy_version(), false),
153 user_agent_(kUserAgent), 154 user_agent_(kUserAgent),
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1426 write_buf.get(), write_buf->size(), write_callback_.callback())); 1427 write_buf.get(), write_buf->size(), write_callback_.callback()));
1427 1428
1428 Run(1); 1429 Run(1);
1429 1430
1430 EXPECT_FALSE(sock_.get()); 1431 EXPECT_FALSE(sock_.get());
1431 EXPECT_TRUE(read_callback.have_result()); 1432 EXPECT_TRUE(read_callback.have_result());
1432 EXPECT_FALSE(write_callback_.have_result()); 1433 EXPECT_FALSE(write_callback_.have_result());
1433 } 1434 }
1434 1435
1435 } // namespace net 1436 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | net/spdy/spdy_session_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698