summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_service.cc
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-13 04:52:01 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-13 04:52:01 +0000
commitdb8f44cb41f402a9145bace60f6097410f46881d (patch)
treee1a403ae9c38a7b5671133185ddc1ac936a89edf /net/proxy/proxy_service.cc
parentd49801990067e7fe9a3caf141f31c6e6ba58fcfc (diff)
downloadchromium_src-db8f44cb41f402a9145bace60f6097410f46881d.zip
chromium_src-db8f44cb41f402a9145bace60f6097410f46881d.tar.gz
chromium_src-db8f44cb41f402a9145bace60f6097410f46881d.tar.bz2
Reverting 6966.
this failed UI tests catastrophically Review URL: http://codereview.chromium.org/14103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_service.cc')
-rw-r--r--net/proxy/proxy_service.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index e8fa060..5f0f6b2 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -305,11 +305,6 @@ ProxyService* ProxyService::Create(const ProxyInfo* pi) {
#endif
}
-// static
-ProxyService* ProxyService::CreateNull() {
- return new ProxyService(new ProxyResolverNull());
-}
-
int ProxyService::ResolveProxy(const GURL& url, ProxyInfo* result,
CompletionCallback* callback,
PacRequest** pac_request) {