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 "net/spdy/spdy_test_util.h" | 5 #include "net/spdy/spdy_test_util.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
| 13 #include "net/base/multi_threaded_cert_verifier.h" |
13 #include "net/http/http_network_session.h" | 14 #include "net/http/http_network_session.h" |
14 #include "net/http/http_network_transaction.h" | 15 #include "net/http/http_network_transaction.h" |
15 #include "net/http/http_server_properties_impl.h" | 16 #include "net/http/http_server_properties_impl.h" |
16 #include "net/spdy/spdy_framer.h" | 17 #include "net/spdy/spdy_framer.h" |
17 #include "net/spdy/spdy_http_utils.h" | 18 #include "net/spdy/spdy_http_utils.h" |
18 | 19 |
19 namespace net { | 20 namespace net { |
20 | 21 |
21 // Chop a frame into an array of MockWrites. | 22 // Chop a frame into an array of MockWrites. |
22 // |data| is the frame to chop. | 23 // |data| is the frame to chop. |
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
895 for (int i = 0; i < num_frames; ++i) { | 896 for (int i = 0; i < num_frames; ++i) { |
896 int len = frames[i]->length() + spdy::SpdyFrame::kHeaderSize; | 897 int len = frames[i]->length() + spdy::SpdyFrame::kHeaderSize; |
897 memcpy(ptr, frames[i]->data(), len); | 898 memcpy(ptr, frames[i]->data(), len); |
898 ptr += len; | 899 ptr += len; |
899 } | 900 } |
900 return total_len; | 901 return total_len; |
901 } | 902 } |
902 | 903 |
903 SpdySessionDependencies::SpdySessionDependencies() | 904 SpdySessionDependencies::SpdySessionDependencies() |
904 : host_resolver(new MockCachingHostResolver), | 905 : host_resolver(new MockCachingHostResolver), |
905 cert_verifier(new CertVerifier), | 906 cert_verifier(new MultiThreadedCertVerifier), |
906 proxy_service(ProxyService::CreateDirect()), | 907 proxy_service(ProxyService::CreateDirect()), |
907 ssl_config_service(new SSLConfigServiceDefaults), | 908 ssl_config_service(new SSLConfigServiceDefaults), |
908 socket_factory(new MockClientSocketFactory), | 909 socket_factory(new MockClientSocketFactory), |
909 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 910 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
910 http_auth_handler_factory( | 911 http_auth_handler_factory( |
911 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) { | 912 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) { |
912 // Note: The CancelledTransaction test does cleanup by running all | 913 // Note: The CancelledTransaction test does cleanup by running all |
913 // tasks in the message loop (RunAllPending). Unfortunately, that | 914 // tasks in the message loop (RunAllPending). Unfortunately, that |
914 // doesn't clean up tasks on the host resolver thread; and | 915 // doesn't clean up tasks on the host resolver thread; and |
915 // TCPConnectJob is currently not cancellable. Using synchronous | 916 // TCPConnectJob is currently not cancellable. Using synchronous |
916 // lookups allows the test to shutdown cleanly. Until we have | 917 // lookups allows the test to shutdown cleanly. Until we have |
917 // cancellable TCPConnectJobs, use synchronous lookups. | 918 // cancellable TCPConnectJobs, use synchronous lookups. |
918 host_resolver->set_synchronous_mode(true); | 919 host_resolver->set_synchronous_mode(true); |
919 } | 920 } |
920 | 921 |
921 SpdySessionDependencies::SpdySessionDependencies(ProxyService* proxy_service) | 922 SpdySessionDependencies::SpdySessionDependencies(ProxyService* proxy_service) |
922 : host_resolver(new MockHostResolver), | 923 : host_resolver(new MockHostResolver), |
923 cert_verifier(new CertVerifier), | 924 cert_verifier(new MultiThreadedCertVerifier), |
924 proxy_service(proxy_service), | 925 proxy_service(proxy_service), |
925 ssl_config_service(new SSLConfigServiceDefaults), | 926 ssl_config_service(new SSLConfigServiceDefaults), |
926 socket_factory(new MockClientSocketFactory), | 927 socket_factory(new MockClientSocketFactory), |
927 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 928 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
928 http_auth_handler_factory( | 929 http_auth_handler_factory( |
929 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) {} | 930 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) {} |
930 | 931 |
931 SpdySessionDependencies::~SpdySessionDependencies() {} | 932 SpdySessionDependencies::~SpdySessionDependencies() {} |
932 | 933 |
933 // static | 934 // static |
(...skipping 23 matching lines...) Expand all Loading... |
957 params.ssl_config_service = session_deps->ssl_config_service; | 958 params.ssl_config_service = session_deps->ssl_config_service; |
958 params.http_auth_handler_factory = | 959 params.http_auth_handler_factory = |
959 session_deps->http_auth_handler_factory.get(); | 960 session_deps->http_auth_handler_factory.get(); |
960 params.http_server_properties = &session_deps->http_server_properties; | 961 params.http_server_properties = &session_deps->http_server_properties; |
961 return new HttpNetworkSession(params); | 962 return new HttpNetworkSession(params); |
962 } | 963 } |
963 | 964 |
964 SpdyURLRequestContext::SpdyURLRequestContext() | 965 SpdyURLRequestContext::SpdyURLRequestContext() |
965 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { | 966 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { |
966 storage_.set_host_resolver(new MockHostResolver()); | 967 storage_.set_host_resolver(new MockHostResolver()); |
967 storage_.set_cert_verifier(new CertVerifier); | 968 storage_.set_cert_verifier(new MultiThreadedCertVerifier); |
968 storage_.set_proxy_service(ProxyService::CreateDirect()); | 969 storage_.set_proxy_service(ProxyService::CreateDirect()); |
969 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 970 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
970 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault( | 971 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault( |
971 host_resolver())); | 972 host_resolver())); |
972 storage_.set_http_server_properties(new HttpServerPropertiesImpl); | 973 storage_.set_http_server_properties(new HttpServerPropertiesImpl); |
973 net::HttpNetworkSession::Params params; | 974 net::HttpNetworkSession::Params params; |
974 params.client_socket_factory = &socket_factory_; | 975 params.client_socket_factory = &socket_factory_; |
975 params.host_resolver = host_resolver(); | 976 params.host_resolver = host_resolver(); |
976 params.cert_verifier = cert_verifier(); | 977 params.cert_verifier = cert_verifier(); |
977 params.proxy_service = proxy_service(); | 978 params.proxy_service = proxy_service(); |
(...skipping 20 matching lines...) Expand all Loading... |
998 spdy::CONTROL_FLAG_FIN, // Control Flags | 999 spdy::CONTROL_FLAG_FIN, // Control Flags |
999 false, // Compressed | 1000 false, // Compressed |
1000 spdy::INVALID, // Status | 1001 spdy::INVALID, // Status |
1001 NULL, // Data | 1002 NULL, // Data |
1002 0, // Length | 1003 0, // Length |
1003 spdy::DATA_FLAG_NONE // Data Flags | 1004 spdy::DATA_FLAG_NONE // Data Flags |
1004 }; | 1005 }; |
1005 return kHeader; | 1006 return kHeader; |
1006 } | 1007 } |
1007 } // namespace net | 1008 } // namespace net |
OLD | NEW |