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

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

Issue 7827033: Introduce net::HttpServerPropertiesManager to manage server-specific properties. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/base/cert_verifier.h" 5 #include "net/base/cert_verifier.h"
6 #include "net/base/mock_host_resolver.h" 6 #include "net/base/mock_host_resolver.h"
7 #include "net/base/net_log.h" 7 #include "net/base/net_log.h"
8 #include "net/base/ssl_config_service_defaults.h" 8 #include "net/base/ssl_config_service_defaults.h"
9 #include "net/http/http_network_layer.h" 9 #include "net/http/http_network_layer.h"
10 #include "net/http/http_network_session.h" 10 #include "net/http/http_network_session.h"
(...skipping 12 matching lines...) Expand all
23 protected: 23 protected:
24 HttpNetworkLayerTest() 24 HttpNetworkLayerTest()
25 : proxy_service_(ProxyService::CreateDirect()), 25 : proxy_service_(ProxyService::CreateDirect()),
26 ssl_config_service_(new SSLConfigServiceDefaults) { 26 ssl_config_service_(new SSLConfigServiceDefaults) {
27 HttpNetworkSession::Params session_params; 27 HttpNetworkSession::Params session_params;
28 session_params.client_socket_factory = &mock_socket_factory_; 28 session_params.client_socket_factory = &mock_socket_factory_;
29 session_params.host_resolver = &host_resolver_; 29 session_params.host_resolver = &host_resolver_;
30 session_params.cert_verifier = &cert_verifier_; 30 session_params.cert_verifier = &cert_verifier_;
31 session_params.proxy_service = proxy_service_.get(); 31 session_params.proxy_service = proxy_service_.get();
32 session_params.ssl_config_service = ssl_config_service_; 32 session_params.ssl_config_service = ssl_config_service_;
33 session_params.http_server_properties = NULL;
33 network_session_ = new HttpNetworkSession(session_params); 34 network_session_ = new HttpNetworkSession(session_params);
34 factory_.reset(new HttpNetworkLayer(network_session_)); 35 factory_.reset(new HttpNetworkLayer(network_session_));
35 } 36 }
36 37
37 MockClientSocketFactory mock_socket_factory_; 38 MockClientSocketFactory mock_socket_factory_;
38 MockHostResolver host_resolver_; 39 MockHostResolver host_resolver_;
39 CertVerifier cert_verifier_; 40 CertVerifier cert_verifier_;
40 const scoped_ptr<ProxyService> proxy_service_; 41 const scoped_ptr<ProxyService> proxy_service_;
41 const scoped_refptr<SSLConfigService> ssl_config_service_; 42 const scoped_refptr<SSLConfigService> ssl_config_service_;
42 scoped_refptr<HttpNetworkSession> network_session_; 43 scoped_refptr<HttpNetworkSession> network_session_;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 107
107 std::string contents; 108 std::string contents;
108 rv = ReadTransaction(trans.get(), &contents); 109 rv = ReadTransaction(trans.get(), &contents);
109 EXPECT_EQ(OK, rv); 110 EXPECT_EQ(OK, rv);
110 EXPECT_EQ("hello world", contents); 111 EXPECT_EQ("hello world", contents);
111 } 112 }
112 113
113 } // namespace 114 } // namespace
114 115
115 } // namespace net 116 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698