summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-25 20:33:42 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-25 20:33:42 +0000
commit89836e2574a390828deb9bf86f0d169f7aacfd39 (patch)
treed41fc75cbd5d348051cf66fe12a2bf0c8f9987d4 /net
parent1a8f5d1d016723fb1fcc49b1fc5290fa1b7f2706 (diff)
downloadchromium_src-89836e2574a390828deb9bf86f0d169f7aacfd39.zip
chromium_src-89836e2574a390828deb9bf86f0d169f7aacfd39.tar.gz
chromium_src-89836e2574a390828deb9bf86f0d169f7aacfd39.tar.bz2
Provide autorelease pool management on the Mac in all types of message pumps.
Fix a few unit tests to use autorelease pools as needed. Review URL: http://codereview.chromium.org/3805 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_network_transaction.cc1
-rw-r--r--net/http/http_network_transaction_unittest.cc3
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;
}