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

1 files changed, 9 insertions, 3 deletions

diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 58b3f606d..e2b8ca3 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -23,6 +23,7 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request.h"
+#include "net/proxy/proxy_resolver_null.h"
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/url_util.h"
@@ -34,9 +35,14 @@ const std::string kDefaultHostName("localhost");
 class TestURLRequestContext : public URLRequestContext {
  public:
   TestURLRequestContext() {
-    proxy_service_ = net::ProxyService::CreateNull();
-    http_transaction_factory_.reset(
-        net::HttpNetworkLayer::CreateFactory(proxy_service_));
+    proxy_service_ = new net::ProxyService(new net::ProxyResolverNull);
+    http_transaction_factory_ =
+        net::HttpNetworkLayer::CreateFactory(proxy_service_);
+  }
+
+  virtual ~TestURLRequestContext() {
+    delete http_transaction_factory_;
+    delete proxy_service_;
   }
 };