diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 14:56:27 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 14:56:27 +0000 |
commit | 88a2c4078d51ef9c5aec9270d8f72e517ad94e4e (patch) | |
tree | a81dd5083fccc7f60028a25ecb554916ba26cf80 /net/spdy | |
parent | dd43578d4929c6502944871bc752905d5b61566f (diff) | |
download | chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.zip chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.tar.gz chromium_src-88a2c4078d51ef9c5aec9270d8f72e517ad94e4e.tar.bz2 |
Trying to green up the tree, lots of mac and win red around this cl.
Revert 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
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/3444001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59373 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, 7 insertions, 2 deletions
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index 392fb3b..57afd53 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc @@ -28,6 +28,11 @@ 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 c30cb5c..3d7ce0c 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::CreateDirect()), + proxy_service(ProxyService::CreateNull()), 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::CreateDirect(); + proxy_service_ = ProxyService::CreateNull(); spdy_session_pool_ = new SpdySessionPool(NULL); ssl_config_service_ = new SSLConfigServiceDefaults; http_auth_handler_factory_ = HttpAuthHandlerFactory::CreateDefault(); |