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

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

Issue 11348333: Clean up SpdySessionDependencies to remove code duplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 8 years 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) 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 #ifndef NET_SPDY_SPDY_TEST_UTIL_H_ 5 #ifndef NET_SPDY_SPDY_TEST_UTIL_H_
6 #define NET_SPDY_SPDY_TEST_UTIL_H_ 6 #define NET_SPDY_SPDY_TEST_UTIL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "net/base/cert_verifier.h" 10 #include "net/base/cert_verifier.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 // Custom proxy service dependency. 353 // Custom proxy service dependency.
354 explicit SpdySessionDependencies(ProxyService* proxy_service); 354 explicit SpdySessionDependencies(ProxyService* proxy_service);
355 355
356 ~SpdySessionDependencies(); 356 ~SpdySessionDependencies();
357 357
358 static HttpNetworkSession* SpdyCreateSession( 358 static HttpNetworkSession* SpdyCreateSession(
359 SpdySessionDependencies* session_deps); 359 SpdySessionDependencies* session_deps);
360 static HttpNetworkSession* SpdyCreateSessionDeterministic( 360 static HttpNetworkSession* SpdyCreateSessionDeterministic(
361 SpdySessionDependencies* session_deps); 361 SpdySessionDependencies* session_deps);
362 362
363 net::HttpNetworkSession::Params CreateSessionParams();
364
363 // NOTE: host_resolver must be ordered before http_auth_handler_factory. 365 // NOTE: host_resolver must be ordered before http_auth_handler_factory.
364 scoped_ptr<MockHostResolverBase> host_resolver; 366 scoped_ptr<MockHostResolverBase> host_resolver;
365 scoped_ptr<CertVerifier> cert_verifier; 367 scoped_ptr<CertVerifier> cert_verifier;
366 scoped_ptr<ProxyService> proxy_service; 368 scoped_ptr<ProxyService> proxy_service;
367 scoped_refptr<SSLConfigService> ssl_config_service; 369 scoped_refptr<SSLConfigService> ssl_config_service;
368 scoped_ptr<MockClientSocketFactory> socket_factory; 370 scoped_ptr<MockClientSocketFactory> socket_factory;
369 scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory; 371 scoped_ptr<DeterministicMockClientSocketFactory> deterministic_socket_factory;
370 scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory; 372 scoped_ptr<HttpAuthHandlerFactory> http_auth_handler_factory;
371 HttpServerPropertiesImpl http_server_properties; 373 HttpServerPropertiesImpl http_server_properties;
372 std::string trusted_spdy_proxy; 374 std::string trusted_spdy_proxy;
375 NetLog* net_log;
373 }; 376 };
374 377
375 class SpdyURLRequestContext : public URLRequestContext { 378 class SpdyURLRequestContext : public URLRequestContext {
376 public: 379 public:
377 SpdyURLRequestContext(); 380 SpdyURLRequestContext();
378 virtual ~SpdyURLRequestContext(); 381 virtual ~SpdyURLRequestContext();
379 382
380 MockClientSocketFactory& socket_factory() { return socket_factory_; } 383 MockClientSocketFactory& socket_factory() { return socket_factory_; }
381 384
382 private: 385 private:
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 scoped_ptr<crypto::ECSignatureCreatorFactory> ec_signature_creator_factory_; 433 scoped_ptr<crypto::ECSignatureCreatorFactory> ec_signature_creator_factory_;
431 434
432 DISALLOW_COPY_AND_ASSIGN(SpdyTestStateHelper); 435 DISALLOW_COPY_AND_ASSIGN(SpdyTestStateHelper);
433 }; 436 };
434 437
435 } // namespace test_spdy3 438 } // namespace test_spdy3
436 439
437 } // namespace net 440 } // namespace net
438 441
439 #endif // NET_SPDY_SPDY_TEST_UTIL_H_ 442 #endif // NET_SPDY_SPDY_TEST_UTIL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698