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

Side by Side Diff: net/tools/quic/end_to_end_test.cc

Issue 217053010: Revert of Rename PrivateMode enum values: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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_websocket_stream_unittest.cc ('k') | net/tools/quic/quic_client_bin.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 <stddef.h> 5 #include <stddef.h>
6 #include <string> 6 #include <string>
7 #include <sys/epoll.h> 7 #include <sys/epoll.h>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 class EndToEndTest : public ::testing::TestWithParam<TestParams> { 150 class EndToEndTest : public ::testing::TestWithParam<TestParams> {
151 protected: 151 protected:
152 EndToEndTest() 152 EndToEndTest()
153 : server_started_(false), 153 : server_started_(false),
154 strike_register_no_startup_period_(false) { 154 strike_register_no_startup_period_(false) {
155 net::IPAddressNumber ip; 155 net::IPAddressNumber ip;
156 CHECK(net::ParseIPLiteralToNumber("127.0.0.1", &ip)); 156 CHECK(net::ParseIPLiteralToNumber("127.0.0.1", &ip));
157 uint port = 0; 157 uint port = 0;
158 server_address_ = IPEndPoint(ip, port); 158 server_address_ = IPEndPoint(ip, port);
159 server_key_ = QuicSessionKey("example.com", port, false, 159 server_key_ = QuicSessionKey("example.com", port, false,
160 PRIVACY_MODE_DISABLED); 160 kPrivacyModeDisabled);
161 161
162 client_supported_versions_ = GetParam().client_supported_versions; 162 client_supported_versions_ = GetParam().client_supported_versions;
163 server_supported_versions_ = GetParam().server_supported_versions; 163 server_supported_versions_ = GetParam().server_supported_versions;
164 negotiated_version_ = GetParam().negotiated_version; 164 negotiated_version_ = GetParam().negotiated_version;
165 FLAGS_enable_quic_pacing = GetParam().use_pacing; 165 FLAGS_enable_quic_pacing = GetParam().use_pacing;
166 VLOG(1) << "Using Configuration: " << GetParam(); 166 VLOG(1) << "Using Configuration: " << GetParam();
167 167
168 client_config_.SetDefaults(); 168 client_config_.SetDefaults();
169 server_config_.SetDefaults(); 169 server_config_.SetDefaults();
170 server_config_.set_initial_round_trip_time_us(kMaxInitialRoundTripTimeUs, 170 server_config_.set_initial_round_trip_time_us(kMaxInitialRoundTripTimeUs,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } 220 }
221 221
222 void StartServer() { 222 void StartServer() {
223 server_thread_.reset(new ServerThread(server_address_, server_config_, 223 server_thread_.reset(new ServerThread(server_address_, server_config_,
224 server_supported_versions_, 224 server_supported_versions_,
225 strike_register_no_startup_period_)); 225 strike_register_no_startup_period_));
226 server_thread_->Initialize(); 226 server_thread_->Initialize();
227 server_address_ = IPEndPoint(server_address_.address(), 227 server_address_ = IPEndPoint(server_address_.address(),
228 server_thread_->GetPort()); 228 server_thread_->GetPort());
229 server_key_ = QuicSessionKey(server_key_.host(), server_thread_->GetPort(), 229 server_key_ = QuicSessionKey(server_key_.host(), server_thread_->GetPort(),
230 false, PRIVACY_MODE_DISABLED); 230 false, kPrivacyModeDisabled);
231 231
232 QuicDispatcher* dispatcher = 232 QuicDispatcher* dispatcher =
233 QuicServerPeer::GetDispatcher(server_thread_->server()); 233 QuicServerPeer::GetDispatcher(server_thread_->server());
234 QuicDispatcherPeer::UseWriter(dispatcher, server_writer_); 234 QuicDispatcherPeer::UseWriter(dispatcher, server_writer_);
235 server_writer_->Initialize( 235 server_writer_->Initialize(
236 QuicDispatcherPeer::GetHelper(dispatcher), 236 QuicDispatcherPeer::GetHelper(dispatcher),
237 new ServerDelegate(dispatcher)); 237 new ServerDelegate(dispatcher));
238 server_thread_->Start(); 238 server_thread_->Start();
239 server_started_ = true; 239 server_started_ = true;
240 } 240 }
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 client_->SendSynchronousRequest("/bar"); 868 client_->SendSynchronousRequest("/bar");
869 869
870 EXPECT_EQ(QUIC_STREAM_CONNECTION_ERROR, client_->stream_error()); 870 EXPECT_EQ(QUIC_STREAM_CONNECTION_ERROR, client_->stream_error());
871 EXPECT_EQ(QUIC_ERROR_MIGRATING_ADDRESS, client_->connection_error()); 871 EXPECT_EQ(QUIC_ERROR_MIGRATING_ADDRESS, client_->connection_error());
872 } 872 }
873 873
874 } // namespace 874 } // namespace
875 } // namespace test 875 } // namespace test
876 } // namespace tools 876 } // namespace tools
877 } // namespace net 877 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_websocket_stream_unittest.cc ('k') | net/tools/quic/quic_client_bin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698