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

Side by Side Diff: net/http/http_network_layer_unittest.cc

Issue 1342613002: Revert of Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « net/http/http_network_layer.cc ('k') | net/http/http_network_session.h » ('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/http/http_network_layer.h" 5 #include "net/http/http_network_layer.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "net/cert/mock_cert_verifier.h" 9 #include "net/cert/mock_cert_verifier.h"
10 #include "net/dns/mock_host_resolver.h" 10 #include "net/dns/mock_host_resolver.h"
(...skipping 27 matching lines...) Expand all
38 proxy_service_.reset(proxy_service); 38 proxy_service_.reset(proxy_service);
39 HttpNetworkSession::Params session_params; 39 HttpNetworkSession::Params session_params;
40 session_params.client_socket_factory = &mock_socket_factory_; 40 session_params.client_socket_factory = &mock_socket_factory_;
41 session_params.host_resolver = &host_resolver_; 41 session_params.host_resolver = &host_resolver_;
42 session_params.cert_verifier = cert_verifier_.get(); 42 session_params.cert_verifier = cert_verifier_.get();
43 session_params.transport_security_state = transport_security_state_.get(); 43 session_params.transport_security_state = transport_security_state_.get();
44 session_params.proxy_service = proxy_service_.get(); 44 session_params.proxy_service = proxy_service_.get();
45 session_params.ssl_config_service = ssl_config_service_.get(); 45 session_params.ssl_config_service = ssl_config_service_.get();
46 session_params.http_server_properties = 46 session_params.http_server_properties =
47 http_server_properties_.GetWeakPtr(); 47 http_server_properties_.GetWeakPtr();
48 network_session_.reset(new HttpNetworkSession(session_params)); 48 network_session_ = new HttpNetworkSession(session_params);
49 factory_.reset(new HttpNetworkLayer(network_session_.get())); 49 factory_.reset(new HttpNetworkLayer(network_session_.get()));
50 } 50 }
51 51
52 void ExecuteRequestExpectingContentAndHeader(const std::string& method, 52 void ExecuteRequestExpectingContentAndHeader(const std::string& method,
53 const std::string& content, 53 const std::string& content,
54 const std::string& header, 54 const std::string& header,
55 const std::string& value) { 55 const std::string& value) {
56 TestCompletionCallback callback; 56 TestCompletionCallback callback;
57 57
58 HttpRequestInfo request_info; 58 HttpRequestInfo request_info;
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 // We should also observe the bad proxy or proxies in the retry list. 252 // We should also observe the bad proxy or proxies in the retry list.
253 TestBadProxies(proxy_count, bad_proxy, bad_proxy2); 253 TestBadProxies(proxy_count, bad_proxy, bad_proxy2);
254 } 254 }
255 255
256 MockClientSocketFactory mock_socket_factory_; 256 MockClientSocketFactory mock_socket_factory_;
257 MockHostResolver host_resolver_; 257 MockHostResolver host_resolver_;
258 scoped_ptr<CertVerifier> cert_verifier_; 258 scoped_ptr<CertVerifier> cert_verifier_;
259 scoped_ptr<TransportSecurityState> transport_security_state_; 259 scoped_ptr<TransportSecurityState> transport_security_state_;
260 scoped_ptr<ProxyService> proxy_service_; 260 scoped_ptr<ProxyService> proxy_service_;
261 const scoped_refptr<SSLConfigService> ssl_config_service_; 261 const scoped_refptr<SSLConfigService> ssl_config_service_;
262 scoped_ptr<HttpNetworkSession> network_session_; 262 scoped_refptr<HttpNetworkSession> network_session_;
263 scoped_ptr<HttpNetworkLayer> factory_; 263 scoped_ptr<HttpNetworkLayer> factory_;
264 HttpServerPropertiesImpl http_server_properties_; 264 HttpServerPropertiesImpl http_server_properties_;
265 }; 265 };
266 266
267 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) { 267 TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
268 scoped_ptr<HttpTransaction> trans; 268 scoped_ptr<HttpTransaction> trans;
269 int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans); 269 int rv = factory_->CreateTransaction(DEFAULT_PRIORITY, &trans);
270 EXPECT_EQ(OK, rv); 270 EXPECT_EQ(OK, rv);
271 EXPECT_TRUE(trans.get() != NULL); 271 EXPECT_TRUE(trans.get() != NULL);
272 } 272 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 rv = trans->Start(&request_info, callback.callback(), BoundNetLog()); 395 rv = trans->Start(&request_info, callback.callback(), BoundNetLog());
396 ASSERT_EQ(ERR_CONNECTION_RESET, callback.GetResult(rv)); 396 ASSERT_EQ(ERR_CONNECTION_RESET, callback.GetResult(rv));
397 397
398 // network_accessed is true; the HTTP stack did try to make a connection. 398 // network_accessed is true; the HTTP stack did try to make a connection.
399 EXPECT_TRUE(trans->GetResponseInfo()->network_accessed); 399 EXPECT_TRUE(trans->GetResponseInfo()->network_accessed);
400 } 400 }
401 401
402 } // namespace 402 } // namespace
403 403
404 } // namespace net 404 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_layer.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698