| Index: net/http/http_network_layer_unittest.cc
|
| ===================================================================
|
| --- net/http/http_network_layer_unittest.cc (revision 6881)
|
| +++ net/http/http_network_layer_unittest.cc (working copy)
|
| @@ -5,7 +5,6 @@
|
| #include "net/base/scoped_host_mapper.h"
|
| #include "net/http/http_network_layer.h"
|
| #include "net/http/http_transaction_unittest.h"
|
| -#include "net/proxy/proxy_resolver_null.h"
|
| #include "net/proxy/proxy_service.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "testing/platform_test.h"
|
| @@ -22,15 +21,12 @@
|
| };
|
|
|
| TEST_F(HttpNetworkLayerTest, CreateAndDestroy) {
|
| - net::ProxyService proxy_service(new net::ProxyResolverNull);
|
| - net::HttpNetworkLayer factory(&proxy_service);
|
| -
|
| + net::HttpNetworkLayer factory(net::ProxyService::CreateNull());
|
| scoped_ptr<net::HttpTransaction> trans(factory.CreateTransaction());
|
| }
|
|
|
| TEST_F(HttpNetworkLayerTest, Suspend) {
|
| - net::ProxyService proxy_service(new net::ProxyResolverNull);
|
| - net::HttpNetworkLayer factory(&proxy_service);
|
| + net::HttpNetworkLayer factory(net::ProxyService::CreateNull());
|
|
|
| scoped_ptr<net::HttpTransaction> trans(factory.CreateTransaction());
|
| trans.reset();
|
| @@ -46,8 +42,7 @@
|
| }
|
|
|
| TEST_F(HttpNetworkLayerTest, GoogleGET) {
|
| - net::ProxyService proxy_service(new net::ProxyResolverNull);
|
| - net::HttpNetworkLayer factory(&proxy_service);
|
| + net::HttpNetworkLayer factory(net::ProxyService::CreateNull());
|
|
|
| TestCompletionCallback callback;
|
|
|
|
|