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, 7 insertions, 3 deletions

diff --git a/net/http/http_transaction_winhttp_unittest.cc b/net/http/http_transaction_winhttp_unittest.cc
index 03787dd..acc4e08 100644
--- a/net/http/http_transaction_winhttp_unittest.cc
+++ b/net/http/http_transaction_winhttp_unittest.cc
@@ -4,16 +4,19 @@
 
 #include "net/http/http_transaction_winhttp.h"
 #include "net/http/http_transaction_unittest.h"
+#include "net/proxy/proxy_resolver_null.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(HttpTransactionWinHttp, CreateAndDestroy) {
-  net::HttpTransactionWinHttp::Factory factory(net::ProxyService::CreateNull());
+  net::ProxyService proxy_service(new net::ProxyResolverNull);
+  net::HttpTransactionWinHttp::Factory factory(&proxy_service);
 
   scoped_ptr<net::HttpTransaction> trans(factory.CreateTransaction());
 }
 
 TEST(HttpTransactionWinHttp, Suspend) {
-  net::HttpTransactionWinHttp::Factory factory(net::ProxyService::CreateNull());
+  net::ProxyService proxy_service(new net::ProxyResolverNull);
+  net::HttpTransactionWinHttp::Factory factory(&proxy_service);
 
   scoped_ptr<net::HttpTransaction> trans(factory.CreateTransaction());
   trans.reset();
@@ -29,7 +32,8 @@ TEST(HttpTransactionWinHttp, Suspend) {
 }
 
 TEST(HttpTransactionWinHttp, GoogleGET) {
-  net::HttpTransactionWinHttp::Factory factory(net::ProxyService::CreateNull());
+  net::ProxyService proxy_service(new net::ProxyResolverNull);
+  net::HttpTransactionWinHttp::Factory factory(&proxy_service);
   TestCompletionCallback callback;
 
   scoped_ptr<net::HttpTransaction> trans(factory.CreateTransaction());