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

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

Issue 1878143005: SHP 4: Change AlternativeServiceMap to use SchemeHostPort as the key. No change to Pref data. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@SHP_3
Patch Set: fix a comment Created 4 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
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 <string> 5 #include <string>
6 #include <utility> 6 #include <utility>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 bool priority_to_dependency; 102 bool priority_to_dependency;
103 }; 103 };
104 104
105 void UpdateSpdySessionDependencies(SpdyNetworkTransactionTestParams test_params, 105 void UpdateSpdySessionDependencies(SpdyNetworkTransactionTestParams test_params,
106 SpdySessionDependencies* session_deps) { 106 SpdySessionDependencies* session_deps) {
107 session_deps->parse_alternative_services = true; 107 session_deps->parse_alternative_services = true;
108 session_deps->enable_alternative_service_with_different_host = true; 108 session_deps->enable_alternative_service_with_different_host = true;
109 if (test_params.ssl_type == HTTP_SPDY_VIA_ALT_SVC) { 109 if (test_params.ssl_type == HTTP_SPDY_VIA_ALT_SVC) {
110 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); 110 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1);
111 session_deps->http_server_properties.SetAlternativeService( 111 session_deps->http_server_properties.SetAlternativeService(
112 HostPortPair("www.example.org", 80), 112 url::SchemeHostPort("http", "www.example.org", 80),
Ryan Hamilton 2016/04/18 17:18:40 https, perhaps?
Zhongyi Shi 2016/04/18 19:26:37 Done.
113 AlternativeService(AlternateProtocolFromNextProto(test_params.protocol), 113 AlternativeService(AlternateProtocolFromNextProto(test_params.protocol),
114 "www.example.org", 443), 114 "www.example.org", 443),
115 expiration); 115 expiration);
116 } 116 }
117 session_deps->enable_priority_dependencies = 117 session_deps->enable_priority_dependencies =
118 test_params.priority_to_dependency; 118 test_params.priority_to_dependency;
119 } 119 }
120 120
121 scoped_ptr<SpdySessionDependencies> CreateSpdySessionDependencies( 121 scoped_ptr<SpdySessionDependencies> CreateSpdySessionDependencies(
122 SpdyNetworkTransactionTestParams test_params) { 122 SpdyNetworkTransactionTestParams test_params) {
(...skipping 6996 matching lines...) Expand 10 before | Expand all | Expand 10 after
7119 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { 7119 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) {
7120 scoped_ptr<SSLSocketDataProvider> ssl_provider( 7120 scoped_ptr<SSLSocketDataProvider> ssl_provider(
7121 new SSLSocketDataProvider(ASYNC, OK)); 7121 new SSLSocketDataProvider(ASYNC, OK));
7122 // Set to TLS_RSA_WITH_NULL_MD5 7122 // Set to TLS_RSA_WITH_NULL_MD5
7123 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); 7123 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status);
7124 7124
7125 RunTLSUsageCheckTest(std::move(ssl_provider)); 7125 RunTLSUsageCheckTest(std::move(ssl_provider));
7126 } 7126 }
7127 7127
7128 } // namespace net 7128 } // namespace net
OLDNEW
« net/quic/quic_stream_factory.cc ('K') | « net/quic/quic_stream_factory_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698