Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 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 #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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "net/base/cert_verifier.h" | 10 #include "net/base/cert_verifier.h" |
| 11 #include "net/base/mock_host_resolver.h" | 11 #include "net/base/mock_host_resolver.h" |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 390 session_deps-> | 390 session_deps-> |
| 391 deterministic_socket_factory.get(), | 391 deterministic_socket_factory.get(), |
| 392 session_deps->ssl_config_service, | 392 session_deps->ssl_config_service, |
| 393 new SpdySessionPool(NULL), | 393 new SpdySessionPool(NULL), |
| 394 session_deps->http_auth_handler_factory.get(), | 394 session_deps->http_auth_handler_factory.get(), |
| 395 NULL, | 395 NULL, |
| 396 NULL); | 396 NULL); |
| 397 } | 397 } |
| 398 }; | 398 }; |
| 399 | 399 |
| 400 class SpdyURLRequestContext : public URLRequestContext { | 400 class SpdyURLRequestContext : public net::URLRequestContext { |
|
wtc
2011/01/15 17:54:23
Undo this change (already in the 'net' namespace).
| |
| 401 public: | 401 public: |
| 402 SpdyURLRequestContext() { | 402 SpdyURLRequestContext() { |
| 403 host_resolver_ = new MockHostResolver(); | 403 host_resolver_ = new MockHostResolver(); |
| 404 cert_verifier_ = new CertVerifier; | 404 cert_verifier_ = new CertVerifier; |
| 405 proxy_service_ = ProxyService::CreateDirect(); | 405 proxy_service_ = ProxyService::CreateDirect(); |
| 406 ssl_config_service_ = new SSLConfigServiceDefaults; | 406 ssl_config_service_ = new SSLConfigServiceDefaults; |
| 407 http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault( | 407 http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault( |
| 408 host_resolver_); | 408 host_resolver_); |
| 409 http_transaction_factory_ = new net::HttpCache( | 409 http_transaction_factory_ = new net::HttpCache( |
| 410 new HttpNetworkLayer(&socket_factory_, | 410 new HttpNetworkLayer(&socket_factory_, |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 434 } | 434 } |
| 435 | 435 |
| 436 private: | 436 private: |
| 437 MockClientSocketFactory socket_factory_; | 437 MockClientSocketFactory socket_factory_; |
| 438 }; | 438 }; |
| 439 | 439 |
| 440 const SpdyHeaderInfo make_spdy_header(spdy::SpdyControlType type); | 440 const SpdyHeaderInfo make_spdy_header(spdy::SpdyControlType type); |
| 441 } // namespace net | 441 } // namespace net |
| 442 | 442 |
| 443 #endif // NET_SPDY_SPDY_TEST_UTIL_H_ | 443 #endif // NET_SPDY_SPDY_TEST_UTIL_H_ |
| OLD | NEW |