diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 13:22:01 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 13:22:01 +0000 |
| commit | a154ba9bc83408f1f27b27c4dce6af71486b9166 (patch) | |
| tree | 8efdb3c6a96e3c55922d6fcba78c2de7900a47da /net/spdy | |
| parent | 328653c2e32b570d8cdbef3938b8b834f3b5abfb (diff) | |
| download | chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.zip chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.tar.gz chromium_src-a154ba9bc83408f1f27b27c4dce6af71486b9166.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_stream_unittest.cc | 5 | ||||
| -rw-r--r-- | net/spdy/spdy_test_util.h | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index 57afd53..392fb3b 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc @@ -28,11 +28,6 @@ class SpdySessionPoolPeer { namespace { -// Create a proxy service which fails on all requests (falls back to direct). -ProxyService* CreateNullProxyService() { - return ProxyService::CreateNull(); -} - class TestSpdyStreamDelegate : public SpdyStream::Delegate { public: TestSpdyStreamDelegate(SpdyStream* stream, 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(); |