summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:13:07 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 18:13:07 +0000
commit9b6fee14acedde5c6b627d5f9b691776fc8d868c (patch)
tree8cd3438dc3b6504066f89096e37db4cff4b903ed /net/http
parentb1ed7b9beaf3069b54084c453da6db6bed56607c (diff)
downloadchromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.zip
chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.gz
chromium_src-9b6fee14acedde5c6b627d5f9b691776fc8d868c.tar.bz2
Avoid potential "NULL used as int" warnings by changing ASSERT_EQ(NULL, ...) to ASSERT_TRUE(... == NULL). Patch by Jacob Mandelson (see http://codereview.chromium.org/202057 ), r=me.
BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_network_transaction_unittest.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index 0148a77..b80938e 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -2757,19 +2757,19 @@ TEST_F(HttpNetworkTransactionTest, ResetStateForRestart) {
trans->ResetStateForRestart();
// Verify that the state that needed to be reset, has been reset.
- EXPECT_EQ(NULL, trans->header_buf_->headers());
+ EXPECT_TRUE(trans->header_buf_->headers() == NULL);
EXPECT_EQ(0, trans->header_buf_capacity_);
EXPECT_EQ(0, trans->header_buf_len_);
EXPECT_EQ(-1, trans->header_buf_body_offset_);
EXPECT_EQ(-1, trans->header_buf_http_offset_);
EXPECT_EQ(-1, trans->response_body_length_);
EXPECT_EQ(0, trans->response_body_read_);
- EXPECT_EQ(NULL, trans->read_buf_.get());
+ EXPECT_TRUE(trans->read_buf_.get() == NULL);
EXPECT_EQ(0, trans->read_buf_len_);
EXPECT_EQ("", trans->request_headers_->headers_);
EXPECT_EQ(0U, trans->request_headers_bytes_sent_);
- EXPECT_EQ(NULL, trans->response_.auth_challenge.get());
- EXPECT_EQ(NULL, trans->response_.headers.get());
+ EXPECT_TRUE(trans->response_.auth_challenge.get() == NULL);
+ EXPECT_TRUE(trans->response_.headers.get() == NULL);
EXPECT_EQ(false, trans->response_.was_cached);
EXPECT_EQ(0, trans->response_.ssl_info.cert_status);
EXPECT_FALSE(trans->response_.vary_data.is_valid());