From ad74a59d383e658187ae48d084c7a65145d84449 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Fri, 21 Jan 2011 18:40:55 +0000 Subject: More net/ reordering. In addition to the normal method reordering, this patch also deinlines net/base/test_completion_callback.h and places the compiled code in the net_test_support target. Minimization of that header also required adding includes in a few unit tests. BUG=68682 TEST=compiles Review URL: http://codereview.chromium.org/6341004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72162 0039d316-1c4b-4281-b951-d872f2087c98 --- net/spdy/spdy_test_util.h | 98 ++++++----------------------------------------- 1 file changed, 11 insertions(+), 87 deletions(-) (limited to 'net/spdy/spdy_test_util.h') diff --git a/net/spdy/spdy_test_util.h b/net/spdy/spdy_test_util.h index 698d511..8839514 100644 --- a/net/spdy/spdy_test_util.h +++ b/net/spdy/spdy_test_util.h @@ -326,34 +326,17 @@ int CombineFrames(const spdy::SpdyFrame** frames, int num_frames, class SpdySessionDependencies { public: // Default set of dependencies -- "null" proxy service. - SpdySessionDependencies() - : host_resolver(new MockHostResolver), - cert_verifier(new CertVerifier), - proxy_service(ProxyService::CreateDirect()), - ssl_config_service(new SSLConfigServiceDefaults), - socket_factory(new MockClientSocketFactory), - deterministic_socket_factory(new DeterministicMockClientSocketFactory), - http_auth_handler_factory( - HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) { - // Note: The CancelledTransaction test does cleanup by running all - // tasks in the message loop (RunAllPending). Unfortunately, that - // doesn't clean up tasks on the host resolver thread; and - // TCPConnectJob is currently not cancellable. Using synchronous - // lookups allows the test to shutdown cleanly. Until we have - // cancellable TCPConnectJobs, use synchronous lookups. - host_resolver->set_synchronous_mode(true); - } + SpdySessionDependencies(); // Custom proxy service dependency. - explicit SpdySessionDependencies(ProxyService* proxy_service) - : host_resolver(new MockHostResolver), - cert_verifier(new CertVerifier), - proxy_service(proxy_service), - ssl_config_service(new SSLConfigServiceDefaults), - socket_factory(new MockClientSocketFactory), - deterministic_socket_factory(new DeterministicMockClientSocketFactory), - http_auth_handler_factory( - HttpAuthHandlerFactory::CreateDefault(host_resolver.get())) {} + explicit SpdySessionDependencies(ProxyService* proxy_service); + + ~SpdySessionDependencies(); + + static HttpNetworkSession* SpdyCreateSession( + SpdySessionDependencies* session_deps); + static HttpNetworkSession* SpdyCreateSessionDeterministic( + SpdySessionDependencies* session_deps); // NOTE: host_resolver must be ordered before http_auth_handler_factory. scoped_ptr host_resolver; @@ -363,75 +346,16 @@ class SpdySessionDependencies { scoped_ptr socket_factory; scoped_ptr deterministic_socket_factory; scoped_ptr http_auth_handler_factory; - - static HttpNetworkSession* SpdyCreateSession( - SpdySessionDependencies* session_deps) { - return new HttpNetworkSession(session_deps->host_resolver.get(), - session_deps->cert_verifier.get(), - NULL /* dnsrr_resolver */, - NULL /* dns_cert_checker */, - NULL /* ssl_host_info_factory */, - session_deps->proxy_service, - session_deps->socket_factory.get(), - session_deps->ssl_config_service, - new SpdySessionPool(NULL), - session_deps->http_auth_handler_factory.get(), - NULL, - NULL); - } - static HttpNetworkSession* SpdyCreateSessionDeterministic( - SpdySessionDependencies* session_deps) { - return new HttpNetworkSession(session_deps->host_resolver.get(), - session_deps->cert_verifier.get(), - NULL /* dnsrr_resolver */, - NULL /* dns_cert_checker */, - NULL /* ssl_host_info_factory */, - session_deps->proxy_service, - session_deps-> - deterministic_socket_factory.get(), - session_deps->ssl_config_service, - new SpdySessionPool(NULL), - session_deps->http_auth_handler_factory.get(), - NULL, - NULL); - } }; class SpdyURLRequestContext : public URLRequestContext { public: - SpdyURLRequestContext() { - host_resolver_ = new MockHostResolver(); - cert_verifier_ = new CertVerifier; - proxy_service_ = ProxyService::CreateDirect(); - ssl_config_service_ = new SSLConfigServiceDefaults; - http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault( - host_resolver_); - http_transaction_factory_ = new HttpCache( - new HttpNetworkLayer(&socket_factory_, - host_resolver_, - cert_verifier_, - NULL /* dnsrr_resolver */, - NULL /* dns_cert_checker */, - NULL /* ssl_host_info_factory */, - proxy_service_, - ssl_config_service_, - new SpdySessionPool(NULL), - http_auth_handler_factory_, - network_delegate_, - NULL), - NULL /* net_log */, - HttpCache::DefaultBackend::InMemory(0)); - } + SpdyURLRequestContext(); MockClientSocketFactory& socket_factory() { return socket_factory_; } protected: - virtual ~SpdyURLRequestContext() { - delete http_transaction_factory_; - delete http_auth_handler_factory_; - delete cert_verifier_; - delete host_resolver_; - } + virtual ~SpdyURLRequestContext(); private: MockClientSocketFactory socket_factory_; -- cgit v1.1