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

Side by Side Diff: net/spdy/spdy_test_util_common.h

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enforce CalledOnValidThread in all non-static methods. Created 7 years, 6 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/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_test_util_common.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ 5 #ifndef NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
6 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ 6 #define NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "crypto/ec_private_key.h" 10 #include "crypto/ec_private_key.h"
11 #include "crypto/ec_signature_creator.h" 11 #include "crypto/ec_signature_creator.h"
12 #include "net/base/completion_callback.h" 12 #include "net/base/completion_callback.h"
13 #include "net/base/request_priority.h" 13 #include "net/base/request_priority.h"
14 #include "net/base/test_completion_callback.h" 14 #include "net/base/test_completion_callback.h"
15 #include "net/cert/cert_verifier.h" 15 #include "net/cert/cert_verifier.h"
16 #include "net/dns/mock_host_resolver.h" 16 #include "net/dns/mock_host_resolver.h"
17 #include "net/http/http_auth_handler_factory.h" 17 #include "net/http/http_auth_handler_factory.h"
18 #include "net/http/http_network_session.h" 18 #include "net/http/http_network_session.h"
19 #include "net/http/http_server_properties_impl.h" 19 #include "net/http/http_server_properties_impl.h"
20 #include "net/http/transport_security_state.h"
20 #include "net/proxy/proxy_service.h" 21 #include "net/proxy/proxy_service.h"
21 #include "net/socket/next_proto.h" 22 #include "net/socket/next_proto.h"
22 #include "net/socket/socket_test_util.h" 23 #include "net/socket/socket_test_util.h"
23 #include "net/spdy/spdy_protocol.h" 24 #include "net/spdy/spdy_protocol.h"
24 #include "net/ssl/ssl_config_service_defaults.h" 25 #include "net/ssl/ssl_config_service_defaults.h"
25 #include "net/url_request/url_request_context.h" 26 #include "net/url_request/url_request_context.h"
26 #include "net/url_request/url_request_context_storage.h" 27 #include "net/url_request/url_request_context_storage.h"
27 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
28 29
29 class GURL; 30 class GURL;
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 static HttpNetworkSession* SpdyCreateSession( 187 static HttpNetworkSession* SpdyCreateSession(
187 SpdySessionDependencies* session_deps); 188 SpdySessionDependencies* session_deps);
188 static HttpNetworkSession* SpdyCreateSessionDeterministic( 189 static HttpNetworkSession* SpdyCreateSessionDeterministic(
189 SpdySessionDependencies* session_deps); 190 SpdySessionDependencies* session_deps);
190 static HttpNetworkSession::Params CreateSessionParams( 191 static HttpNetworkSession::Params CreateSessionParams(
191 SpdySessionDependencies* session_deps); 192 SpdySessionDependencies* session_deps);
192 193
193 // NOTE: host_resolver must be ordered before http_auth_handler_factory. 194 // NOTE: host_resolver must be ordered before http_auth_handler_factory.
194 scoped_ptr<MockHostResolverBase> host_resolver; 195 scoped_ptr<MockHostResolverBase> host_resolver;
195 scoped_ptr<CertVerifier> cert_verifier; 196 scoped_ptr<CertVerifier> cert_verifier;
197 scoped_ptr<TransportSecurityState> transport_security_state;
196 scoped_ptr<ProxyService> proxy_service; 198 scoped_ptr<ProxyService> proxy_service;
197 scoped_refptr<SSLConfigService> ssl_config_service; 199 scoped_refptr<SSLConfigService> ssl_config_service;
198 scoped_ptr<MockClientSocketFactory> socket_factory; 200 scoped_ptr<MockClientSocketFactory> socket_factory;
199 scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory; 201 scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory;
200 scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory; 202 scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory;
201 HttpServerPropertiesImpl http_server_properties; 203 HttpServerPropertiesImpl http_server_properties;
202 bool enable_ip_pooling; 204 bool enable_ip_pooling;
203 bool enable_compression; 205 bool enable_compression;
204 bool enable_ping; 206 bool enable_ping;
205 bool enable_user_alternate_protocol_ports; 207 bool enable_user_alternate_protocol_ports;
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 const char* GetPathKey() const; 472 const char* GetPathKey() const;
471 473
472 private: 474 private:
473 const NextProto protocol_; 475 const NextProto protocol_;
474 const SpdyMajorVersion spdy_version_; 476 const SpdyMajorVersion spdy_version_;
475 }; 477 };
476 478
477 } // namespace net 479 } // namespace net
478 480
479 #endif // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_ 481 #endif // NET_SPDY_SPDY_TEST_UTIL_COMMON_H_
OLDNEW
« no previous file with comments | « net/socket_stream/socket_stream.cc ('k') | net/spdy/spdy_test_util_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698