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

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

Issue 10831277: [net] Change factory methods for HostResolver and HostCache to return a scoped_ptr (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unnecessary initialization; respond to review Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl_unittest.cc ('k') | net/spdy/spdy_test_util_spdy3.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "net/spdy/spdy_test_util_spdy2.h" 5 #include "net/spdy/spdy_test_util_spdy2.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 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 HttpNetworkSession* http_session = new HttpNetworkSession(params); 963 HttpNetworkSession* http_session = new HttpNetworkSession(params);
964 SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool()); 964 SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool());
965 pool_peer.EnableSendingInitialSettings(false); 965 pool_peer.EnableSendingInitialSettings(false);
966 return http_session; 966 return http_session;
967 } 967 }
968 968
969 SpdyURLRequestContext::SpdyURLRequestContext() 969 SpdyURLRequestContext::SpdyURLRequestContext()
970 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { 970 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
971 storage_.set_host_resolver(new MockHostResolver()); 971 storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver));
972 storage_.set_cert_verifier(new MockCertVerifier); 972 storage_.set_cert_verifier(new MockCertVerifier);
973 storage_.set_proxy_service(ProxyService::CreateDirect()); 973 storage_.set_proxy_service(ProxyService::CreateDirect());
974 storage_.set_ssl_config_service(new SSLConfigServiceDefaults); 974 storage_.set_ssl_config_service(new SSLConfigServiceDefaults);
975 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault( 975 storage_.set_http_auth_handler_factory(HttpAuthHandlerFactory::CreateDefault(
976 host_resolver())); 976 host_resolver()));
977 storage_.set_http_server_properties(new HttpServerPropertiesImpl); 977 storage_.set_http_server_properties(new HttpServerPropertiesImpl);
978 net::HttpNetworkSession::Params params; 978 net::HttpNetworkSession::Params params;
979 params.client_socket_factory = &socket_factory_; 979 params.client_socket_factory = &socket_factory_;
980 params.host_resolver = host_resolver(); 980 params.host_resolver = host_resolver();
981 params.cert_verifier = cert_verifier(); 981 params.cert_verifier = cert_verifier();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1021 } 1021 }
1022 1022
1023 SpdyTestStateHelper::~SpdyTestStateHelper() { 1023 SpdyTestStateHelper::~SpdyTestStateHelper() {
1024 SpdySession::ResetStaticSettingsToInit(); 1024 SpdySession::ResetStaticSettingsToInit();
1025 // TODO(rch): save/restore this value 1025 // TODO(rch): save/restore this value
1026 BufferedSpdyFramer::set_enable_compression_default(true); 1026 BufferedSpdyFramer::set_enable_compression_default(true);
1027 } 1027 }
1028 1028
1029 } // namespace test_spdy2 1029 } // namespace test_spdy2
1030 } // namespace net 1030 } // namespace net
OLDNEW
« no previous file with comments | « net/proxy/proxy_script_fetcher_impl_unittest.cc ('k') | net/spdy/spdy_test_util_spdy3.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698