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

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

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Sync'd to revision p349162. 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
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 14 matching lines...) Expand all
25 namespace { 25 namespace {
26 26
27 class HttpNetworkLayerTest : public PlatformTest { 27 class HttpNetworkLayerTest : public PlatformTest {
28 protected: 28 protected:
29 HttpNetworkLayerTest() : ssl_config_service_(new SSLConfigServiceDefaults) {} 29 HttpNetworkLayerTest() : ssl_config_service_(new SSLConfigServiceDefaults) {}
30 30
31 void SetUp() override { 31 void SetUp() override {
32 ConfigureTestDependencies(ProxyService::CreateDirect()); 32 ConfigureTestDependencies(ProxyService::CreateDirect());
33 } 33 }
34 34
35 void ConfigureTestDependencies(ProxyService* proxy_service) { 35 void ConfigureTestDependencies(scoped_ptr<ProxyService> proxy_service) {
36 cert_verifier_.reset(new MockCertVerifier); 36 cert_verifier_.reset(new MockCertVerifier);
37 transport_security_state_.reset(new TransportSecurityState); 37 transport_security_state_.reset(new TransportSecurityState);
38 proxy_service_.reset(proxy_service); 38 proxy_service_ = proxy_service.Pass();
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_ = new HttpNetworkSession(session_params); 48 network_session_ = new HttpNetworkSession(session_params);
(...skipping 346 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_auth_handler_factory.cc ('k') | net/http/http_network_transaction_ssl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698