| Index: net/spdy/spdy_test_util_common.cc
|
| diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
|
| index 92c9c58675735a9a11bbf2873588ceae69c42c98..4c59d99e9f42503ac8ce08465a608e898ed51c14 100644
|
| --- a/net/spdy/spdy_test_util_common.cc
|
| +++ b/net/spdy/spdy_test_util_common.cc
|
| @@ -495,7 +495,8 @@ SpdyURLRequestContext::~SpdyURLRequestContext() {
|
| }
|
|
|
| bool HasSpdySession(SpdySessionPool* pool, const SpdySessionKey& key) {
|
| - return pool->FindAvailableSession(key, GURL(), BoundNetLog()) != NULL;
|
| + return static_cast<bool>(
|
| + pool->FindAvailableSession(key, GURL(), BoundNetLog()));
|
| }
|
|
|
| namespace {
|
| @@ -551,7 +552,7 @@ base::WeakPtr<SpdySession> CreateSpdySessionHelper(
|
| http_session->spdy_session_pool()->CreateAvailableSessionFromSocket(
|
| key, std::move(connection), net_log, OK, is_secure);
|
| // Failure is reported asynchronously.
|
| - EXPECT_TRUE(spdy_session != NULL);
|
| + EXPECT_TRUE(spdy_session);
|
| EXPECT_TRUE(HasSpdySession(http_session->spdy_session_pool(), key));
|
| return spdy_session;
|
| }
|
| @@ -654,7 +655,7 @@ base::WeakPtr<SpdySession> CreateFakeSpdySessionHelper(
|
| pool->CreateAvailableSessionFromSocket(
|
| key, std::move(handle), BoundNetLog(), OK, true /* is_secure */);
|
| // Failure is reported asynchronously.
|
| - EXPECT_TRUE(spdy_session != NULL);
|
| + EXPECT_TRUE(spdy_session);
|
| EXPECT_TRUE(HasSpdySession(pool, key));
|
| return spdy_session;
|
| }
|
|
|