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

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

Issue 17760008: [SPDY] Enable tests for SPDY/3.1 and SPDY/4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 5 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.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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 GURL url_; 127 GURL url_;
128 HostPortPair proxy_host_port_; 128 HostPortPair proxy_host_port_;
129 HostPortPair endpoint_host_port_pair_; 129 HostPortPair endpoint_host_port_pair_;
130 ProxyServer proxy_; 130 ProxyServer proxy_;
131 SpdySessionKey endpoint_spdy_session_key_; 131 SpdySessionKey endpoint_spdy_session_key_;
132 scoped_refptr<TransportSocketParams> transport_params_; 132 scoped_refptr<TransportSocketParams> transport_params_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest); 134 DISALLOW_COPY_AND_ASSIGN(SpdyProxyClientSocketTest);
135 }; 135 };
136 136
137 INSTANTIATE_TEST_CASE_P(NextProto, 137 INSTANTIATE_TEST_CASE_P(
138 SpdyProxyClientSocketTest, 138 NextProto,
139 testing::Values(kProtoSPDY2, kProtoSPDY3)); 139 SpdyProxyClientSocketTest,
140 testing::Values(kProtoSPDY2, kProtoSPDY3, kProtoSPDY31, kProtoSPDY4a2));
140 141
141 SpdyProxyClientSocketTest::SpdyProxyClientSocketTest() 142 SpdyProxyClientSocketTest::SpdyProxyClientSocketTest()
142 : spdy_util_(GetParam()), 143 : spdy_util_(GetParam()),
143 session_(NULL), 144 session_(NULL),
144 read_buf_(NULL), 145 read_buf_(NULL),
145 session_deps_(GetParam()), 146 session_deps_(GetParam()),
146 connect_data_(SYNCHRONOUS, OK), 147 connect_data_(SYNCHRONOUS, OK),
147 spdy_session_(NULL), 148 spdy_session_(NULL),
148 framer_(spdy_util_.spdy_version(), false), 149 framer_(spdy_util_.spdy_version(), false),
149 user_agent_(kUserAgent), 150 user_agent_(kUserAgent),
(...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after
1437 write_buf.get(), write_buf->size(), write_callback_.callback())); 1438 write_buf.get(), write_buf->size(), write_callback_.callback()));
1438 1439
1439 Run(2); 1440 Run(2);
1440 1441
1441 EXPECT_FALSE(sock_.get()); 1442 EXPECT_FALSE(sock_.get());
1442 EXPECT_TRUE(read_callback.have_result()); 1443 EXPECT_TRUE(read_callback.have_result());
1443 EXPECT_FALSE(write_callback_.have_result()); 1444 EXPECT_FALSE(write_callback_.have_result());
1444 } 1445 }
1445 1446
1446 } // namespace net 1447 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698