Clang: enable -Wbool-conversions and -Wunused-variables on Linux.

net/websockets/websocket_job_unittest.cc

 // Copyright (c) 2010 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.
 
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 245 matching lines @@
       "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
       "Sec-WebSocket-Protocol: sample\r\n"
       "Upgrade: WebSocket\r\n"
       "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
       "Origin: http://example.com\r\n"
       "\r\n"
       "^n:ds[4U";
 
   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());
   websocket_->OnSentData(socket_.get(), strlen(kHandshakeRequestMessage));
   EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent());
 
   const char kHandshakeResponseMessage[] =
       "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
       "Upgrade: WebSocket\r\n"
       "Connection: Upgrade\r\n"
@@ skipping 24 matching lines @@
       "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
       "Sec-WebSocket-Protocol: sample\r\n"
       "Upgrade: WebSocket\r\n"
       "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
       "Origin: http://example.com\r\n"
       "\r\n"
       "^n:ds[4U";
 
   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();
   EXPECT_EQ(kHandshakeRequestMessage, socket_->sent_data());
   EXPECT_EQ(WebSocketJob::CONNECTING, GetWebSocketJobState());
   websocket_->OnSentData(socket_.get(), strlen(kHandshakeRequestMessage));
   EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent());
 
   const char kHandshakeResponseMessage[] =
       "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
@@ skipping 61 matching lines @@
       "Sec-WebSocket-Protocol: sample\r\n"
       "Upgrade: WebSocket\r\n"
       "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
       "Origin: http://example.com\r\n"
       "Cookie: CR-test=1; CR-test-httponly=1\r\n"
       "\r\n"
       "^n:ds[4U";
 
   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());
   websocket_->OnSentData(socket_, strlen(kHandshakeRequestExpected));
   EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent());
 
   const char kHandshakeResponseMessage[] =
       "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
       "Upgrade: WebSocket\r\n"
       "Connection: Upgrade\r\n"
@@ skipping 66 matching lines @@
       "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
       "Sec-WebSocket-Protocol: sample\r\n"
       "Upgrade: WebSocket\r\n"
       "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
       "Origin: http://example.com\r\n"
       "\r\n"
       "^n:ds[4U";
 
   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());
   websocket_->OnSentData(socket_, strlen(kHandshakeRequestExpected));
   EXPECT_EQ(strlen(kHandshakeRequestMessage), delegate.amount_sent());
 
   const char kHandshakeResponseMessage[] =
       "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
       "Upgrade: WebSocket\r\n"
       "Connection: Upgrade\r\n"
@@ skipping 24 matching lines @@
   EXPECT_EQ(2U, cookie_store_->entries().size());
   EXPECT_EQ(cookieUrl, cookie_store_->entries()[0].url);
   EXPECT_EQ("CR-test=1", cookie_store_->entries()[0].cookie_line);
   EXPECT_EQ(cookieUrl, cookie_store_->entries()[1].url);
   EXPECT_EQ("CR-test-httponly=1", cookie_store_->entries()[1].cookie_line);
 
   CloseWebSocketJob();
 }
 
 }  // namespace net