diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 18:13:07 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-29 18:13:07 +0000 |
| commit | 9b6fee14acedde5c6b627d5f9b691776fc8d868c (patch) | |
| tree | 8cd3438dc3b6504066f89096e37db4cff4b903ed /net/socket | |
| parent | b1ed7b9beaf3069b54084c453da6db6bed56607c (diff) | |
| download | chromium_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/socket')
| -rw-r--r-- | net/socket/client_socket_pool_base_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 249d7e3..5741b91 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_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. @@ -340,11 +340,8 @@ class TestConnectJobDelegate : public ConnectJob::Delegate { virtual void OnConnectJobComplete(int result, ConnectJob* job) { result_ = result; scoped_ptr<ClientSocket> socket(job->ReleaseSocket()); - if (result == OK) { - EXPECT_TRUE(socket.get() != NULL); - } else { - EXPECT_EQ(NULL, socket.get()); - } + // socket.get() should be NULL iff result != OK + EXPECT_EQ(socket.get() == NULL, result != OK); delete job; have_result_ = true; if (waiting_for_result_) |