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

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

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « net/spdy/spdy_stream_test_util.cc ('k') | net/spdy/spdy_websocket_stream_spdy2_unittest.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 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 SpdySessionDependencies::~SpdySessionDependencies() {} 928 SpdySessionDependencies::~SpdySessionDependencies() {}
929 929
930 // static 930 // static
931 HttpNetworkSession* SpdySessionDependencies::SpdyCreateSession( 931 HttpNetworkSession* SpdySessionDependencies::SpdyCreateSession(
932 SpdySessionDependencies* session_deps) { 932 SpdySessionDependencies* session_deps) {
933 net::HttpNetworkSession::Params params; 933 net::HttpNetworkSession::Params params;
934 params.client_socket_factory = session_deps->socket_factory.get(); 934 params.client_socket_factory = session_deps->socket_factory.get();
935 params.host_resolver = session_deps->host_resolver.get(); 935 params.host_resolver = session_deps->host_resolver.get();
936 params.cert_verifier = session_deps->cert_verifier.get(); 936 params.cert_verifier = session_deps->cert_verifier.get();
937 params.proxy_service = session_deps->proxy_service.get(); 937 params.proxy_service = session_deps->proxy_service.get();
938 params.ssl_config_service = session_deps->ssl_config_service; 938 params.ssl_config_service = session_deps->ssl_config_service.get();
939 params.http_auth_handler_factory = 939 params.http_auth_handler_factory =
940 session_deps->http_auth_handler_factory.get(); 940 session_deps->http_auth_handler_factory.get();
941 params.http_server_properties = &session_deps->http_server_properties; 941 params.http_server_properties = &session_deps->http_server_properties;
942 params.trusted_spdy_proxy = 942 params.trusted_spdy_proxy =
943 session_deps->trusted_spdy_proxy; 943 session_deps->trusted_spdy_proxy;
944 HttpNetworkSession* http_session = new HttpNetworkSession(params); 944 HttpNetworkSession* http_session = new HttpNetworkSession(params);
945 SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool()); 945 SpdySessionPoolPeer pool_peer(http_session->spdy_session_pool());
946 pool_peer.EnableSendingInitialSettings(false); 946 pool_peer.EnableSendingInitialSettings(false);
947 return http_session; 947 return http_session;
948 } 948 }
949 949
950 // static 950 // static
951 HttpNetworkSession* SpdySessionDependencies::SpdyCreateSessionDeterministic( 951 HttpNetworkSession* SpdySessionDependencies::SpdyCreateSessionDeterministic(
952 SpdySessionDependencies* session_deps) { 952 SpdySessionDependencies* session_deps) {
953 net::HttpNetworkSession::Params params; 953 net::HttpNetworkSession::Params params;
954 params.client_socket_factory = 954 params.client_socket_factory =
955 session_deps->deterministic_socket_factory.get(); 955 session_deps->deterministic_socket_factory.get();
956 params.host_resolver = session_deps->host_resolver.get(); 956 params.host_resolver = session_deps->host_resolver.get();
957 params.cert_verifier = session_deps->cert_verifier.get(); 957 params.cert_verifier = session_deps->cert_verifier.get();
958 params.proxy_service = session_deps->proxy_service.get(); 958 params.proxy_service = session_deps->proxy_service.get();
959 params.ssl_config_service = session_deps->ssl_config_service; 959 params.ssl_config_service = session_deps->ssl_config_service.get();
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 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()
(...skipping 12 matching lines...) Expand all
982 params.proxy_service = proxy_service(); 982 params.proxy_service = proxy_service();
983 params.ssl_config_service = ssl_config_service(); 983 params.ssl_config_service = ssl_config_service();
984 params.http_auth_handler_factory = http_auth_handler_factory(); 984 params.http_auth_handler_factory = http_auth_handler_factory();
985 params.network_delegate = network_delegate(); 985 params.network_delegate = network_delegate();
986 params.http_server_properties = http_server_properties(); 986 params.http_server_properties = http_server_properties();
987 scoped_refptr<HttpNetworkSession> network_session( 987 scoped_refptr<HttpNetworkSession> network_session(
988 new HttpNetworkSession(params)); 988 new HttpNetworkSession(params));
989 SpdySessionPoolPeer pool_peer(network_session->spdy_session_pool()); 989 SpdySessionPoolPeer pool_peer(network_session->spdy_session_pool());
990 pool_peer.EnableSendingInitialSettings(false); 990 pool_peer.EnableSendingInitialSettings(false);
991 storage_.set_http_transaction_factory(new HttpCache( 991 storage_.set_http_transaction_factory(new HttpCache(
992 network_session, 992 network_session.get(),
993 HttpCache::DefaultBackend::InMemory(0))); 993 HttpCache::DefaultBackend::InMemory(0)));
994 } 994 }
995 995
996 SpdyURLRequestContext::~SpdyURLRequestContext() { 996 SpdyURLRequestContext::~SpdyURLRequestContext() {
997 } 997 }
998 998
999 const SpdyHeaderInfo MakeSpdyHeader(SpdyControlType type) { 999 const SpdyHeaderInfo MakeSpdyHeader(SpdyControlType type) {
1000 const SpdyHeaderInfo kHeader = { 1000 const SpdyHeaderInfo kHeader = {
1001 type, // Kind = Syn 1001 type, // Kind = Syn
1002 1, // Stream ID 1002 1, // Stream ID
(...skipping 18 matching lines...) Expand all
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/spdy/spdy_stream_test_util.cc ('k') | net/spdy/spdy_websocket_stream_spdy2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698