diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 05:10:02 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-15 05:10:02 +0000 |
| commit | ebeefff3de6b22ea1447f768399f5fba14820ca8 (patch) | |
| tree | b8923c352b5c316a38a40a14985e87ba7c778b10 /net/spdy/spdy_test_util.h | |
| parent | 38c56c73e185a306b66a9d10ce37a06bf34c70d0 (diff) | |
| download | chromium_src-ebeefff3de6b22ea1447f768399f5fba14820ca8.zip chromium_src-ebeefff3de6b22ea1447f768399f5fba14820ca8.tar.gz chromium_src-ebeefff3de6b22ea1447f768399f5fba14820ca8.tar.bz2 | |
Reland 59362 - net: Rename ProxyService::CreateNull to ProxyService::CreateDirect.
(Note: This was a TODO for eroman).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/3336021
Revert Review URL: http://codereview.chromium.org/3444001/show
TBR=eroman@chromium.org
Fix the bad git svn rebase (that caused a bad merge, that integrates other files
in the original cl, now this should be fixed).
Review URL: http://codereview.chromium.org/3413008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_test_util.h')
| -rw-r--r-- | net/spdy/spdy_test_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/spdy/spdy_test_util.h b/net/spdy/spdy_test_util.h index 3d7ce0c..c30cb5c 100644 --- a/net/spdy/spdy_test_util.h +++ b/net/spdy/spdy_test_util.h @@ -300,7 +300,7 @@ class SpdySessionDependencies { // Default set of dependencies -- "null" proxy service. SpdySessionDependencies() : host_resolver(new MockHostResolver), - proxy_service(ProxyService::CreateNull()), + proxy_service(ProxyService::CreateDirect()), ssl_config_service(new SSLConfigServiceDefaults), socket_factory(new MockClientSocketFactory), deterministic_socket_factory(new DeterministicMockClientSocketFactory), @@ -362,7 +362,7 @@ class SpdyURLRequestContext : public URLRequestContext { public: SpdyURLRequestContext() { host_resolver_ = new MockHostResolver; - proxy_service_ = ProxyService::CreateNull(); + proxy_service_ = ProxyService::CreateDirect(); spdy_session_pool_ = new SpdySessionPool(NULL); ssl_config_service_ = new SSLConfigServiceDefaults; http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault(); |