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

Side by Side Diff: net/quic/quic_network_transaction_unittest.cc

Issue 1268313004: s/use_alternate_protocols/use_alternative_services/g (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re: #15. Created 5 years, 4 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
« no previous file with comments | « net/log/net_log_util.cc ('k') | net/spdy/spdy_network_transaction_unittest.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 <vector> 5 #include <vector>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 params_.host_resolver = &host_resolver_; 248 params_.host_resolver = &host_resolver_;
249 params_.cert_verifier = &cert_verifier_; 249 params_.cert_verifier = &cert_verifier_;
250 params_.transport_security_state = &transport_security_state_; 250 params_.transport_security_state = &transport_security_state_;
251 params_.proxy_service = proxy_service_.get(); 251 params_.proxy_service = proxy_service_.get();
252 params_.ssl_config_service = ssl_config_service_.get(); 252 params_.ssl_config_service = ssl_config_service_.get();
253 params_.http_auth_handler_factory = auth_handler_factory_.get(); 253 params_.http_auth_handler_factory = auth_handler_factory_.get();
254 params_.http_server_properties = http_server_properties_.GetWeakPtr(); 254 params_.http_server_properties = http_server_properties_.GetWeakPtr();
255 params_.quic_supported_versions = SupportedVersions(GetParam()); 255 params_.quic_supported_versions = SupportedVersions(GetParam());
256 256
257 if (use_next_protos) { 257 if (use_next_protos) {
258 params_.use_alternate_protocols = true; 258 params_.use_alternative_services = true;
259 params_.next_protos = NextProtosWithSpdyAndQuic(true, true); 259 params_.next_protos = NextProtosWithSpdyAndQuic(true, true);
260 } 260 }
261 261
262 session_ = new HttpNetworkSession(params_); 262 session_ = new HttpNetworkSession(params_);
263 session_->quic_stream_factory()->set_require_confirmation(false); 263 session_->quic_stream_factory()->set_require_confirmation(false);
264 ASSERT_EQ(params_.quic_socket_receive_buffer_size, 264 ASSERT_EQ(params_.quic_socket_receive_buffer_size,
265 session_->quic_stream_factory()->socket_receive_buffer_size()); 265 session_->quic_stream_factory()->socket_receive_buffer_size());
266 } 266 }
267 267
268 void CheckWasQuicResponse(const scoped_ptr<HttpNetworkTransaction>& trans) { 268 void CheckWasQuicResponse(const scoped_ptr<HttpNetworkTransaction>& trans) {
(...skipping 1472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 1741
1742 request_.url = GURL("https://www.example.org:443"); 1742 request_.url = GURL("https://www.example.org:443");
1743 AddHangingNonAlternateProtocolSocketData(); 1743 AddHangingNonAlternateProtocolSocketData();
1744 CreateSessionWithNextProtos(); 1744 CreateSessionWithNextProtos();
1745 AddQuicAlternateProtocolMapping(MockCryptoClientStream::CONFIRM_HANDSHAKE); 1745 AddQuicAlternateProtocolMapping(MockCryptoClientStream::CONFIRM_HANDSHAKE);
1746 SendRequestAndExpectQuicResponse("hello!"); 1746 SendRequestAndExpectQuicResponse("hello!");
1747 } 1747 }
1748 1748
1749 } // namespace test 1749 } // namespace test
1750 } // namespace net 1750 } // namespace net
OLDNEW
« no previous file with comments | « net/log/net_log_util.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698