2 files changed, 13 insertions, 18 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 8c504fc..1107884 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -9,6 +9,7 @@
 #include "net/http/http_network_session.h"
 #include "net/http/http_network_transaction.h"
 #include "net/proxy/proxy_resolver_fixed.h"
+#include "net/proxy/proxy_resolver_null.h"
 #if defined(OS_WIN)
 #include "net/http/http_transaction_winhttp.h"
 #include "net/proxy/proxy_resolver_winhttp.h"
@@ -53,7 +54,7 @@ HttpNetworkLayer::HttpNetworkLayer(const ProxyInfo* pi)
     proxy_resolver = new ProxyResolverWinHttp();
 #else
     NOTIMPLEMENTED();
-    proxy_resolver = NULL;
+    proxy_resolver = new ProxyResolverNull();
 #endif
   }
   session_ = new HttpNetworkSession(proxy_resolver);
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 2f63d86..7b2f04f 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -11,6 +11,7 @@
 #include "net/http/http_network_transaction.h"
 #include "net/http/http_transaction_unittest.h"
 #include "net/proxy/proxy_resolver_fixed.h"
+#include "net/proxy/proxy_resolver_null.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 //-----------------------------------------------------------------------------
@@ -195,26 +196,17 @@ class MockClientSocketFactory : public net::ClientSocketFactory {
 
 MockClientSocketFactory mock_socket_factory;
 
-class NullProxyResolver : public net::ProxyResolver {
- public:
-  virtual int GetProxyConfig(net::ProxyConfig* config) {
-    return net::ERR_FAILED;
+net::HttpNetworkSession* CreateSession(net::ProxyResolver* proxy_resolver) {
+  if (!proxy_resolver) {
+    proxy_resolver = new net::ProxyResolverNull();
   }
-  virtual int GetProxyForURL(const std::string& query_url,
-                             const std::string& pac_url,
-                             net::ProxyInfo* results) {
-    return net::ERR_FAILED;
-  }
-};
-
-// TODO(eroman): google style disallows default arguments...
-net::HttpNetworkSession* CreateSession(
-    net::ProxyResolver* proxy_resolver = NULL) {
-  if (!proxy_resolver)
-    proxy_resolver = new NullProxyResolver();
   return new net::HttpNetworkSession(proxy_resolver);
 }
 
+net::HttpNetworkSession* CreateSession() {
+  return CreateSession(NULL);
+}
+
 class HttpNetworkTransactionTest : public PlatformTest {
  public:
   virtual void SetUp() {
@@ -261,8 +253,10 @@ SimpleGetHelperResult SimpleGetHelper(MockRead data_reads[]) {
   EXPECT_EQ(net::ERR_IO_PENDING, rv);
 
   out.rv = callback.WaitForResult();
-  if (out.rv != net::OK)
+  if (out.rv != net::OK) {
+    trans->Destroy();
     return out;
+  }
 
   const net::HttpResponseInfo* response = trans->GetResponseInfo();
   EXPECT_TRUE(response != NULL);