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/proxy/proxy_service.cc | |
| 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/proxy/proxy_service.cc')
| -rw-r--r-- | net/proxy/proxy_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc index c74b8b0..3d1539f 100644 --- a/net/proxy/proxy_service.cc +++ b/net/proxy/proxy_service.cc @@ -426,7 +426,7 @@ ProxyService* ProxyService::CreateFixed(const ProxyConfig& pc) { } // static -ProxyService* ProxyService::CreateDirect() { +ProxyService* ProxyService::CreateNull() { // Use direct connections. return new ProxyService(new ProxyConfigServiceDirect, new ProxyResolverNull, NULL); |