OLD | NEW |
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 <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 << ", ssl_type: " << type_str << " }"; | 86 << ", ssl_type: " << type_str << " }"; |
87 return os; | 87 return os; |
88 } | 88 } |
89 | 89 |
90 NextProto protocol; | 90 NextProto protocol; |
91 SpdyNetworkTransactionTestSSLType ssl_type; | 91 SpdyNetworkTransactionTestSSLType ssl_type; |
92 }; | 92 }; |
93 | 93 |
94 void UpdateSpdySessionDependencies(SpdyNetworkTransactionTestParams test_params, | 94 void UpdateSpdySessionDependencies(SpdyNetworkTransactionTestParams test_params, |
95 SpdySessionDependencies* session_deps) { | 95 SpdySessionDependencies* session_deps) { |
96 session_deps->use_alternate_protocols = true; | 96 session_deps->use_alternative_services = true; |
97 session_deps->next_protos = SpdyNextProtos(); | 97 session_deps->next_protos = SpdyNextProtos(); |
98 if (test_params.ssl_type == HTTP_SPDY_VIA_ALT_SVC) { | 98 if (test_params.ssl_type == HTTP_SPDY_VIA_ALT_SVC) { |
99 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); | 99 base::Time expiration = base::Time::Now() + base::TimeDelta::FromDays(1); |
100 session_deps->http_server_properties.SetAlternativeService( | 100 session_deps->http_server_properties.SetAlternativeService( |
101 HostPortPair("www.example.org", 80), | 101 HostPortPair("www.example.org", 80), |
102 AlternativeService(AlternateProtocolFromNextProto(test_params.protocol), | 102 AlternativeService(AlternateProtocolFromNextProto(test_params.protocol), |
103 "www.example.org", 443), | 103 "www.example.org", 443), |
104 1.0, expiration); | 104 1.0, expiration); |
105 } | 105 } |
106 } | 106 } |
(...skipping 6523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6630 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { | 6630 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { |
6631 scoped_ptr<SSLSocketDataProvider> ssl_provider( | 6631 scoped_ptr<SSLSocketDataProvider> ssl_provider( |
6632 new SSLSocketDataProvider(ASYNC, OK)); | 6632 new SSLSocketDataProvider(ASYNC, OK)); |
6633 // Set to TLS_RSA_WITH_NULL_MD5 | 6633 // Set to TLS_RSA_WITH_NULL_MD5 |
6634 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); | 6634 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); |
6635 | 6635 |
6636 RunTLSUsageCheckTest(ssl_provider.Pass()); | 6636 RunTLSUsageCheckTest(ssl_provider.Pass()); |
6637 } | 6637 } |
6638 | 6638 |
6639 } // namespace net | 6639 } // namespace net |
OLD | NEW |