Misc cleanups

- leak in unittest
- remove a platform ifdef

Review URL: http://codereview.chromium.org/7500

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3573 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 28 insertions, 8 deletions

diff --git a/net/proxy/proxy_resolver_null.h b/net/proxy/proxy_resolver_null.h
new file mode 100644
index 0000000..b9f0b32
--- /dev/null
+++ b/net/proxy/proxy_resolver_null.h
@@ -0,0 +1,28 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef NET_PROXY_PROXY_RESOLVER_NULL_H_
+#define NET_PROXY_PROXY_RESOLVER_NULL_H_
+
+#include "net/proxy/proxy_service.h"
+
+namespace net {
+
+// Implementation of ProxyResolver that always fails.
+class ProxyResolverNull : public ProxyResolver {
+ public:
+  virtual int GetProxyConfig(ProxyConfig* config) {
+    return ERR_FAILED;
+  }
+  virtual int GetProxyForURL(const std::string& query_url,
+                             const std::string& pac_url,
+                             ProxyInfo* results) {
+    return ERR_FAILED;
+  }
+};
+
+}  // namespace net
+
+#endif  // NET_PROXY_PROXY_RESOLVER_NULL_H_
+
diff --git a/net/proxy/proxy_service.cc b/net/proxy/proxy_service.cc
index af53ff8..be11692 100644
--- a/net/proxy/proxy_service.cc
+++ b/net/proxy/proxy_service.cc
@@ -421,14 +421,6 @@ void ProxyService::DidCompletePacRequest(int config_id, int result_code) {
 }
 
 void ProxyService::UpdateConfig() {
-#if !defined(WIN_OS)
-  if (!resolver_) {
-    // Tied to the NOTIMPLEMENTED in HttpNetworkLayer::HttpNetworkLayer()
-    NOTIMPLEMENTED();
-    return;
-  }
-#endif
-
   ProxyConfig latest;
   if (resolver_->GetProxyConfig(&latest) != OK)
     return;