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

4 files changed, 42 insertions, 43 deletions

diff --git a/base/allocator/allocator_unittests.cc b/base/allocator/allocator_unittests.cc
index b1aa9cb..d935cf9 100644
--- a/base/allocator/allocator_unittests.cc
+++ b/base/allocator/allocator_unittests.cc
@@ -313,9 +313,9 @@ static void TestOneNewWithoutExceptions(void* (*func)(size_t),
   try {
     void* rv = (*func)(kTooBig);
     EXPECT_EQ(NULL, rv);
-    EXPECT_EQ(false, should_throw) << "allocation should have thrown.";
+    EXPECT_FALSE(should_throw) << "allocation should have thrown.";
   } catch(...) {
-    EXPECT_EQ(true, should_throw) << "allocation threw unexpected exception.";
+    EXPECT_TRUE(should_throw) << "allocation threw unexpected exception.";
   }
 }
 
@@ -359,7 +359,7 @@ TEST(Allocators, Malloc) {
     unsigned char* ptr = reinterpret_cast<unsigned char*>(malloc(size));
     CheckAlignment(ptr, 2);  // Should be 2 byte aligned
     Fill(ptr, size);
-    EXPECT_EQ(true, Valid(ptr, size));
+    EXPECT_TRUE(Valid(ptr, size));
     free(ptr);
   }
 }
@@ -420,9 +420,9 @@ TEST(Allocators, Realloc2) {
       Fill(src, src_size);
       unsigned char* dst =
           reinterpret_cast<unsigned char*>(realloc(src, dst_size));
-      EXPECT_EQ(true, Valid(dst, min(src_size, dst_size)));
+      EXPECT_TRUE(Valid(dst, min(src_size, dst_size)));
       Fill(dst, dst_size);
-      EXPECT_EQ(true, Valid(dst, dst_size));
+      EXPECT_TRUE(Valid(dst, dst_size));
       if (dst != NULL) free(dst);
     }
   }
@@ -468,13 +468,13 @@ TEST(Allocators, Recalloc) {
     for (int dst_size = 0; dst_size >= 0; dst_size = NextSize(dst_size)) {
       unsigned char* src =
           reinterpret_cast<unsigned char*>(_recalloc(NULL, 1, src_size));
-      EXPECT_EQ(true, IsZeroed(src, src_size));
+      EXPECT_TRUE(IsZeroed(src, src_size));
       Fill(src, src_size);
       unsigned char* dst =
           reinterpret_cast<unsigned char*>(_recalloc(src, 1, dst_size));
-      EXPECT_EQ(true, Valid(dst, min(src_size, dst_size)));
+      EXPECT_TRUE(Valid(dst, min(src_size, dst_size)));
       Fill(dst, dst_size);
-      EXPECT_EQ(true, Valid(dst, dst_size));
+      EXPECT_TRUE(Valid(dst, dst_size));
       if (dst != NULL)
         free(dst);
     }
diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc
index c471e38..9576a58 100644
--- a/base/message_loop_unittest.cc
+++ b/base/message_loop_unittest.cc
@@ -1555,18 +1555,18 @@ TEST(MessageLoopTest, HighResolutionTimer) {
   const int kFastTimerMs = 5;
   const int kSlowTimerMs = 100;
 
-  EXPECT_EQ(false, loop.high_resolution_timers_enabled());
+  EXPECT_FALSE(loop.high_resolution_timers_enabled());
 
   // Post a fast task to enable the high resolution timers.
   loop.PostDelayedTask(FROM_HERE, new DummyTask(1), kFastTimerMs);
   loop.Run();
-  EXPECT_EQ(true, loop.high_resolution_timers_enabled());
+  EXPECT_TRUE(loop.high_resolution_timers_enabled());
 
   // Post a slow task and verify high resolution timers
   // are still enabled.
   loop.PostDelayedTask(FROM_HERE, new DummyTask(1), kSlowTimerMs);
   loop.Run();
-  EXPECT_EQ(true, loop.high_resolution_timers_enabled());
+  EXPECT_TRUE(loop.high_resolution_timers_enabled());
 
   // Wait for a while so that high-resolution mode elapses.
   Sleep(MessageLoop::kHighResolutionTimerModeLeaseTimeMs);
@@ -1574,7 +1574,7 @@ TEST(MessageLoopTest, HighResolutionTimer) {
   // Post a slow task to disable the high resolution timers.
   loop.PostDelayedTask(FROM_HERE, new DummyTask(1), kSlowTimerMs);
   loop.Run();
-  EXPECT_EQ(false, loop.high_resolution_timers_enabled());
+  EXPECT_FALSE(loop.high_resolution_timers_enabled());
 }
 
 #endif  // defined(OS_WIN)
diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc
index 9c9f288..fc604b9 100644
--- a/base/message_pump_glib_unittest.cc
+++ b/base/message_pump_glib_unittest.cc
@@ -45,7 +45,6 @@ class EventInjector {
   bool HandleCheck() {
     if (events_.empty())
       return false;
-    Event event = events_[0];
     return events_[0].time <= base::Time::NowFromSystemTime();
   }
 
diff --git a/base/pr_time_unittest.cc b/base/pr_time_unittest.cc
index 6dda299..646eb16 100644
--- a/base/pr_time_unittest.cc
+++ b/base/pr_time_unittest.cc
@@ -136,7 +136,7 @@ TEST_F(PRTimeTest, ParseTimeTest9) {
 TEST_F(PRTimeTest, ParseTimeTest10) {
   Time parsed_time;
   bool result = Time::FromString(L"15/10/07 12:45", &parsed_time);
-  EXPECT_EQ(true, result);
+  EXPECT_TRUE(result);
 
   time_t computed_time = parsed_time.ToTimeT();
   time_t time_to_compare = comparison_time_local_ /
@@ -149,7 +149,7 @@ TEST_F(PRTimeTest, ParseTimeTest11) {
   Time parsed_time;
   bool result = Time::FromString(L"Mon, 15 Oct 2007 19:45:00 GMT",
                                  &parsed_time);
-  EXPECT_EQ(true, result);
+  EXPECT_TRUE(result);
 
   time_t computed_time = parsed_time.ToTimeT();
   time_t time_to_compare = comparison_time_pdt / Time::kMicrosecondsPerSecond;
@@ -161,11 +161,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch0) {
   Time parsed_time;
 
   // time_t == epoch == 0
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:00 +0100 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 01:00:00 +0100 1970",
+                               &parsed_time));
   EXPECT_EQ(0, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:00:00 GMT 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:00:00 GMT 1970",
+                               &parsed_time));
   EXPECT_EQ(0, parsed_time.ToTimeT());
 }
 
@@ -173,11 +173,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch1) {
   Time parsed_time;
 
   // time_t == 1 second after epoch == 1
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:01 +0100 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 01:00:01 +0100 1970",
+                               &parsed_time));
   EXPECT_EQ(1, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:00:01 GMT 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:00:01 GMT 1970",
+                               &parsed_time));
   EXPECT_EQ(1, parsed_time.ToTimeT());
 }
 
@@ -185,11 +185,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch2) {
   Time parsed_time;
 
   // time_t == 2 seconds after epoch == 2
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 01:00:02 +0100 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 01:00:02 +0100 1970",
+                               &parsed_time));
   EXPECT_EQ(2, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:00:02 GMT 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:00:02 GMT 1970",
+                               &parsed_time));
   EXPECT_EQ(2, parsed_time.ToTimeT());
 }
 
@@ -197,11 +197,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpochNeg1) {
   Time parsed_time;
 
   // time_t == 1 second before epoch == -1
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:59:59 +0100 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:59:59 +0100 1970",
+                               &parsed_time));
   EXPECT_EQ(-1, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Wed Dec 31 23:59:59 GMT 1969",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Wed Dec 31 23:59:59 GMT 1969",
+                               &parsed_time));
   EXPECT_EQ(-1, parsed_time.ToTimeT());
 }
 
@@ -211,8 +211,8 @@ TEST_F(PRTimeTest, ParseTimeTestEpochNeg1) {
 TEST_F(PRTimeTest, ParseTimeTestEpochNotNeg1) {
   Time parsed_time;
 
-  EXPECT_EQ(true, Time::FromString(L"Wed Dec 31 23:59:59 GMT 2100",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Wed Dec 31 23:59:59 GMT 2100",
+                               &parsed_time));
   EXPECT_NE(-1, parsed_time.ToTimeT());
 }
 
@@ -220,11 +220,11 @@ TEST_F(PRTimeTest, ParseTimeTestEpochNeg2) {
   Time parsed_time;
 
   // time_t == 2 seconds before epoch == -2
-  EXPECT_EQ(true, Time::FromString(L"Thu Jan 01 00:59:58 +0100 1970",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Thu Jan 01 00:59:58 +0100 1970",
+                               &parsed_time));
   EXPECT_EQ(-2, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Wed Dec 31 23:59:58 GMT 1969",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Wed Dec 31 23:59:58 GMT 1969",
+                               &parsed_time));
   EXPECT_EQ(-2, parsed_time.ToTimeT());
 }
 
@@ -232,14 +232,14 @@ TEST_F(PRTimeTest, ParseTimeTestEpoch1960) {
   Time parsed_time;
 
   // time_t before Epoch, in 1960
-  EXPECT_EQ(true, Time::FromString(L"Wed Jun 29 19:40:01 +0100 1960",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Wed Jun 29 19:40:01 +0100 1960",
+                               &parsed_time));
   EXPECT_EQ(-299999999, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Wed Jun 29 18:40:01 GMT 1960",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Wed Jun 29 18:40:01 GMT 1960",
+                               &parsed_time));
   EXPECT_EQ(-299999999, parsed_time.ToTimeT());
-  EXPECT_EQ(true, Time::FromString(L"Wed Jun 29 17:40:01 GMT 1960",
-                                   &parsed_time));
+  EXPECT_TRUE(Time::FromString(L"Wed Jun 29 17:40:01 GMT 1960",
+                               &parsed_time));
   EXPECT_EQ(-300003599, parsed_time.ToTimeT());
 }