diff options
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_network_transaction.cc | 1 | ||||
| -rw-r--r-- | net/http/http_network_transaction_unittest.cc | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 7da6a63..3e809c5 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -31,7 +31,6 @@ namespace net { HttpNetworkTransaction::HttpNetworkTransaction(HttpNetworkSession* session, ClientSocketFactory* csf) -MSVC_SUPPRESS_WARNING(4355) : ALLOW_THIS_IN_INITIALIZER_LIST( io_callback_(this, &HttpNetworkTransaction::OnIOComplete)), user_callback_(NULL), diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index a39399f..37670ed 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -162,9 +162,10 @@ net::HttpNetworkSession* CreateSession() { return new net::HttpNetworkSession(new NullProxyResolver()); } -class HttpNetworkTransactionTest : public testing::Test { +class HttpNetworkTransactionTest : public PlatformTest { public: virtual void SetUp() { + PlatformTest::SetUp(); mock_sockets[0] = NULL; mock_sockets_index = 0; } |