diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 10:36:28 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 10:36:28 +0000 |
| commit | 515f2492fbc0a023eb089e91e349106da325de5e (patch) | |
| tree | d606fd354fe6c4695fe2f635e62774fe582e8232 /net/websockets | |
| parent | a834a1abc0a318a563d9a0eb3adec0df2947a982 (diff) | |
| download | chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.zip chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.tar.gz chromium_src-515f2492fbc0a023eb089e91e349106da325de5e.tar.bz2 | |
Clang: enable -Wbool-conversions and -Wunused-variables on Linux.
-Wbool-conversion warns about EXPECT_EQ(false, blah), so replace
that with EXPECT_FALSE(blah). Do the same with EXPECT_EQ(true, blah)
for good measure (even though that doesn't generate warnings).
Also remove the one instance of an unused variable.
BUG=69421
TEST=buildbots all compile and all tests pass
Review URL: http://codereview.chromium.org/6300001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket_job_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 43d8509..342a2a3 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -263,7 +263,7 @@ TEST_F(WebSocketJobTest, SimpleHandshake) { bool sent = websocket_->SendData(kHandshakeRequestMessage, strlen(kHandshakeRequestMessage)); - EXPECT_EQ(true, sent); + EXPECT_TRUE(sent); MessageLoop::current()->RunAllPending(); EXPECT_EQ(kHandshakeRequestMessage, socket_->sent_data()); EXPECT_EQ(WebSocketJob::CONNECTING, GetWebSocketJobState()); @@ -308,7 +308,7 @@ TEST_F(WebSocketJobTest, SlowHandshake) { bool sent = websocket_->SendData(kHandshakeRequestMessage, strlen(kHandshakeRequestMessage)); - EXPECT_EQ(true, sent); + EXPECT_TRUE(sent); // We assume request is sent in one data chunk (from WebKit) // We don't support streaming request. MessageLoop::current()->RunAllPending(); @@ -390,7 +390,7 @@ TEST_F(WebSocketJobTest, HandshakeWithCookie) { bool sent = websocket_->SendData(kHandshakeRequestMessage, strlen(kHandshakeRequestMessage)); - EXPECT_EQ(true, sent); + EXPECT_TRUE(sent); MessageLoop::current()->RunAllPending(); EXPECT_EQ(kHandshakeRequestExpected, socket_->sent_data()); EXPECT_EQ(WebSocketJob::CONNECTING, GetWebSocketJobState()); @@ -477,7 +477,7 @@ TEST_F(WebSocketJobTest, HandshakeWithCookieButNotAllowed) { bool sent = websocket_->SendData(kHandshakeRequestMessage, strlen(kHandshakeRequestMessage)); - EXPECT_EQ(true, sent); + EXPECT_TRUE(sent); MessageLoop::current()->RunAllPending(); EXPECT_EQ(kHandshakeRequestExpected, socket_->sent_data()); EXPECT_EQ(WebSocketJob::CONNECTING, GetWebSocketJobState()); |