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_spdy3.h" | 5 #include "net/spdy/spdy_test_util_spdy3.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" |
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
897 for (int i = 0; i < num_frames; ++i) { | 897 for (int i = 0; i < num_frames; ++i) { |
898 int len = frames[i]->length() + spdy::SpdyFrame::kHeaderSize; | 898 int len = frames[i]->length() + spdy::SpdyFrame::kHeaderSize; |
899 memcpy(ptr, frames[i]->data(), len); | 899 memcpy(ptr, frames[i]->data(), len); |
900 ptr += len; | 900 ptr += len; |
901 } | 901 } |
902 return total_len; | 902 return total_len; |
903 } | 903 } |
904 | 904 |
905 SpdySessionDependencies::SpdySessionDependencies() | 905 SpdySessionDependencies::SpdySessionDependencies() |
906 : host_resolver(new MockCachingHostResolver), | 906 : host_resolver(new MockCachingHostResolver), |
907 cert_verifier(new CertVerifier), | 907 cert_verifier(CertVerifier::CreateDefault()), |
908 proxy_service(ProxyService::CreateDirect()), | 908 proxy_service(ProxyService::CreateDirect()), |
909 ssl_config_service(new SSLConfigServiceDefaults), | 909 ssl_config_service(new SSLConfigServiceDefaults), |
910 socket_factory(new MockClientSocketFactory), | 910 socket_factory(new MockClientSocketFactory), |
911 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 911 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
912 http_auth_handler_factory( | 912 http_auth_handler_factory( |
913 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) { | 913 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) { |
914 // Note: The CancelledTransaction test does cleanup by running all | 914 // Note: The CancelledTransaction test does cleanup by running all |
915 // tasks in the message loop (RunAllPending). Unfortunately, that | 915 // tasks in the message loop (RunAllPending). Unfortunately, that |
916 // doesn't clean up tasks on the host resolver thread; and | 916 // doesn't clean up tasks on the host resolver thread; and |
917 // TCPConnectJob is currently not cancellable. Using synchronous | 917 // TCPConnectJob is currently not cancellable. Using synchronous |
918 // lookups allows the test to shutdown cleanly. Until we have | 918 // lookups allows the test to shutdown cleanly. Until we have |
919 // cancellable TCPConnectJobs, use synchronous lookups. | 919 // cancellable TCPConnectJobs, use synchronous lookups. |
920 host_resolver->set_synchronous_mode(true); | 920 host_resolver->set_synchronous_mode(true); |
921 } | 921 } |
922 | 922 |
923 SpdySessionDependencies::SpdySessionDependencies(ProxyService* proxy_service) | 923 SpdySessionDependencies::SpdySessionDependencies(ProxyService* proxy_service) |
924 : host_resolver(new MockHostResolver), | 924 : host_resolver(new MockHostResolver), |
925 cert_verifier(new CertVerifier), | 925 cert_verifier(CertVerifier::CreateDefault()), |
926 proxy_service(proxy_service), | 926 proxy_service(proxy_service), |
927 ssl_config_service(new SSLConfigServiceDefaults), | 927 ssl_config_service(new SSLConfigServiceDefaults), |
928 socket_factory(new MockClientSocketFactory), | 928 socket_factory(new MockClientSocketFactory), |
929 deterministic_socket_factory(new DeterministicMockClientSocketFactory), | 929 deterministic_socket_factory(new DeterministicMockClientSocketFactory), |
930 http_auth_handler_factory( | 930 http_auth_handler_factory( |
931 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) {} | 931 HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) {} |
932 | 932 |
933 SpdySessionDependencies::~SpdySessionDependencies() {} | 933 SpdySessionDependencies::~SpdySessionDependencies() {} |
934 | 934 |
935 // static | 935 // static |
(...skipping 23 matching lines...) Expand all Loading... |
959 params.ssl_config_service = session_deps->ssl_config_service; | 959 params.ssl_config_service = session_deps->ssl_config_service; |
960 params.http_auth_handler_factory = | 960 params.http_auth_handler_factory = |
961 session_deps->http_auth_handler_factory.get(); | 961 session_deps->http_auth_handler_factory.get(); |
962 params.http_server_properties = &session_deps->http_server_properties; | 962 params.http_server_properties = &session_deps->http_server_properties; |
963 return new HttpNetworkSession(params); | 963 return new HttpNetworkSession(params); |
964 } | 964 } |
965 | 965 |
966 SpdyURLRequestContext::SpdyURLRequestContext() | 966 SpdyURLRequestContext::SpdyURLRequestContext() |
967 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { | 967 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { |
968 storage_.set_host_resolver(new MockHostResolver()); | 968 storage_.set_host_resolver(new MockHostResolver()); |
969 storage_.set_cert_verifier(new CertVerifier); | 969 storage_.set_cert_verifier(CertVerifier::CreateDefault()); |
970 storage_.set_proxy_service(ProxyService::CreateDirect()); | 970 storage_.set_proxy_service(ProxyService::CreateDirect()); |
971 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); | 971 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); |
972 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault( | 972 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault( |
973 host_resolver())); | 973 host_resolver())); |
974 storage_.set_http_server_properties(new HttpServerPropertiesImpl); | 974 storage_.set_http_server_properties(new HttpServerPropertiesImpl); |
975 net::HttpNetworkSession::Params params; | 975 net::HttpNetworkSession::Params params; |
976 params.client_socket_factory = &socket_factory_; | 976 params.client_socket_factory = &socket_factory_; |
977 params.host_resolver = host_resolver(); | 977 params.host_resolver = host_resolver(); |
978 params.cert_verifier = cert_verifier(); | 978 params.cert_verifier = cert_verifier(); |
979 params.proxy_service = proxy_service(); | 979 params.proxy_service = proxy_service(); |
(...skipping 23 matching lines...) Expand all Loading... |
1003 NULL, // Data | 1003 NULL, // Data |
1004 0, // Length | 1004 0, // Length |
1005 spdy::DATA_FLAG_NONE // Data Flags | 1005 spdy::DATA_FLAG_NONE // Data Flags |
1006 }; | 1006 }; |
1007 return kHeader; | 1007 return kHeader; |
1008 } | 1008 } |
1009 | 1009 |
1010 } // namespace test_spdy3 | 1010 } // namespace test_spdy3 |
1011 | 1011 |
1012 } // namespace net | 1012 } // namespace net |
OLD | NEW |