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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 | 69 |
70 NextProto protocol; | 70 NextProto protocol; |
71 SpdyNetworkTransactionTestSSLType ssl_type; | 71 SpdyNetworkTransactionTestSSLType ssl_type; |
72 }; | 72 }; |
73 | 73 |
74 void UpdateSpdySessionDependencies( | 74 void UpdateSpdySessionDependencies( |
75 SpdyNetworkTransactionTestParams test_params, | 75 SpdyNetworkTransactionTestParams test_params, |
76 SpdySessionDependencies* session_deps) { | 76 SpdySessionDependencies* session_deps) { |
77 switch (test_params.ssl_type) { | 77 switch (test_params.ssl_type) { |
78 case SPDYNPN: | 78 case SPDYNPN: |
79 session_deps->http_server_properties.SetAlternateProtocol( | 79 session_deps->http_server_properties.AddAlternateProtocol( |
80 HostPortPair("www.google.com", 80), 443, | 80 HostPortPair("www.google.com", 80), 443, |
81 AlternateProtocolFromNextProto(test_params.protocol), 1); | 81 AlternateProtocolFromNextProto(test_params.protocol), 1); |
82 session_deps->use_alternate_protocols = true; | 82 session_deps->use_alternate_protocols = true; |
83 session_deps->next_protos = SpdyNextProtos(); | 83 session_deps->next_protos = SpdyNextProtos(); |
84 break; | 84 break; |
85 case SPDYNOSSL: | 85 case SPDYNOSSL: |
86 session_deps->force_spdy_over_ssl = false; | 86 session_deps->force_spdy_over_ssl = false; |
87 session_deps->force_spdy_always = true; | 87 session_deps->force_spdy_always = true; |
88 break; | 88 break; |
89 case SPDYSSL: | 89 case SPDYSSL: |
(...skipping 6729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6819 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { | 6819 TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSCipherSuiteSucky) { |
6820 scoped_ptr<SSLSocketDataProvider> ssl_provider( | 6820 scoped_ptr<SSLSocketDataProvider> ssl_provider( |
6821 new SSLSocketDataProvider(ASYNC, OK)); | 6821 new SSLSocketDataProvider(ASYNC, OK)); |
6822 // Set to TLS_RSA_WITH_NULL_MD5 | 6822 // Set to TLS_RSA_WITH_NULL_MD5 |
6823 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); | 6823 SSLConnectionStatusSetCipherSuite(0x1, &ssl_provider->connection_status); |
6824 | 6824 |
6825 RunTLSUsageCheckTest(ssl_provider.Pass()); | 6825 RunTLSUsageCheckTest(ssl_provider.Pass()); |
6826 } | 6826 } |
6827 | 6827 |
6828 } // namespace net | 6828 } // namespace net |
OLD | NEW |