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

28 files changed, 178 insertions, 194 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());
 }
 
diff --git a/build/common.gypi b/build/common.gypi
index 768160a..eb7b370 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1136,13 +1136,8 @@
           }],
           ['clang==1', {
             'cflags': [
-              # Don't warn about unused variables, due to a common pattern:
-              #   scoped_deleter unused_variable(&thing_to_delete);
-              '-Wno-unused-variable',
               # Clang spots more unused functions.
               '-Wno-unused-function',
-              # gtest confuses clang.
-              '-Wno-bool-conversions',
               # Don't die on dtoa code that uses a char as an array index.
               '-Wno-char-subscripts',
               # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
diff --git a/ceee/ie/broker/cookie_api_module_unittest.cc b/ceee/ie/broker/cookie_api_module_unittest.cc
index 8ca0c3b..c83e2b0 100644
--- a/ceee/ie/broker/cookie_api_module_unittest.cc
+++ b/ceee/ie/broker/cookie_api_module_unittest.cc
@@ -956,15 +956,12 @@ TEST_F(CookieApiTests, CookieChangedEventHandler) {
   std::string converted_args;
   // Empty args.
   std::string input_args = "";
-  EXPECT_EQ(false,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_FALSE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
   // Invalid args.
   input_args = "[false, {hello]";
-  EXPECT_EQ(false,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_FALSE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
   input_args = "[3]";
-  EXPECT_EQ(false,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_FALSE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
   // Valid args.
   input_args = "[{\"removed\": false, \"cookie\": {\"storeId\": \"1\"}}]";
 
@@ -973,8 +970,7 @@ TEST_F(CookieApiTests, CookieChangedEventHandler) {
   EXPECT_CALL(*cookie_changed.api_result_,
               GetAnyWindowInStore(StrEq("1"), true, _, _))
       .WillOnce(Return(false));
-  EXPECT_EQ(false,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_FALSE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
 
   // Cookie store access errors.
   cookie_changed.AllocateApiResult();
@@ -985,8 +981,7 @@ TEST_F(CookieApiTests, CookieChangedEventHandler) {
                       Return(true)));
   EXPECT_CALL(*cookie_changed.api_result_,
               CookieStoreIsRegistered(HWND(5))).WillOnce(Return(E_FAIL));
-  EXPECT_EQ(false,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_FALSE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
 
   cookie_changed.AllocateApiResult();
   EXPECT_CALL(*cookie_changed.api_result_,
@@ -998,8 +993,7 @@ TEST_F(CookieApiTests, CookieChangedEventHandler) {
               CookieStoreIsRegistered(HWND(5))).WillOnce(Return(S_FALSE));
   EXPECT_CALL(*cookie_changed.api_result_,
               RegisterCookieStore(HWND(5))).WillOnce(Return(E_FAIL));
-  EXPECT_EQ(false,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_FALSE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
 
   // Registered cookie store.
   cookie_changed.AllocateApiResult();
@@ -1010,8 +1004,7 @@ TEST_F(CookieApiTests, CookieChangedEventHandler) {
                       Return(true)));
   EXPECT_CALL(*cookie_changed.api_result_,
               CookieStoreIsRegistered(HWND(5))).WillOnce(Return(S_OK));
-  EXPECT_EQ(true,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_TRUE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
 
   // Unregistered cookie store.
   cookie_changed.AllocateApiResult();
@@ -1024,8 +1017,7 @@ TEST_F(CookieApiTests, CookieChangedEventHandler) {
               CookieStoreIsRegistered(HWND(5))).WillOnce(Return(S_FALSE));
   EXPECT_CALL(*cookie_changed.api_result_,
               RegisterCookieStore(HWND(5))).WillOnce(Return(S_OK));
-  EXPECT_EQ(true,
-            cookie_changed.EventHandlerImpl(input_args, &converted_args));
+  EXPECT_TRUE(cookie_changed.EventHandlerImpl(input_args, &converted_args));
 }
 
 }  // namespace
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 6b59740..0183893 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -178,7 +178,7 @@ class ExtensionPrefsEscalatePermissions : public ExtensionPrefsTest {
   }
 
   virtual void Verify() {
-    EXPECT_EQ(true, prefs()->DidExtensionEscalatePermissions(extension->id()));
+    EXPECT_TRUE(prefs()->DidExtensionEscalatePermissions(extension->id()));
   }
 
  private:
diff --git a/chrome/browser/password_manager/password_store_mac_unittest.cc b/chrome/browser/password_manager/password_store_mac_unittest.cc
index 92d536d..0248066 100644
--- a/chrome/browser/password_manager/password_store_mac_unittest.cc
+++ b/chrome/browser/password_manager/password_store_mac_unittest.cc
@@ -852,7 +852,7 @@ TEST_F(PasswordStoreMacInternalsTest, TestPasswordBulkLookup) {
   ASSERT_EQ(3U, merged_forms.size());
   EXPECT_EQ(ASCIIToUTF16("sekrit"), merged_forms[0]->password_value);
   EXPECT_EQ(ASCIIToUTF16("sekrit"), merged_forms[1]->password_value);
-  EXPECT_EQ(true, merged_forms[2]->blacklisted_by_user);
+  EXPECT_TRUE(merged_forms[2]->blacklisted_by_user);
 
   STLDeleteElements(&database_forms);
   STLDeleteElements(&merged_forms);
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index d3dae0e..db40397 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -1091,7 +1091,7 @@ TEST_F(DirectoryBackingStoreTest, MigrateVersion70To71) {
   std::string model_id = s.ColumnString(0);
   EXPECT_EQ("C2881000", base::HexEncode(model_id.data(), model_id.size()))
       << "Model ID is expected to be the empty BookmarkSpecifics proto.";
-  EXPECT_EQ(true, s.ColumnBool(1));
+  EXPECT_TRUE(s.ColumnBool(1));
   EXPECT_EQ(694, s.ColumnInt64(2));
   ASSERT_FALSE(s.Step());
 }
diff --git a/chrome/browser/tab_contents/navigation_controller_unittest.cc b/chrome/browser/tab_contents/navigation_controller_unittest.cc
index 1935457..ca337a7 100644
--- a/chrome/browser/tab_contents/navigation_controller_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_controller_unittest.cc
@@ -1641,7 +1641,7 @@ TEST_F(NavigationControllerTest, ViewSourceRedirect) {
   controller().RendererDidNavigate(params, 0, &details);
 
   EXPECT_EQ(ASCIIToUTF16(kExpected), contents()->GetTitle());
-  EXPECT_EQ(true, contents()->ShouldDisplayURL());
+  EXPECT_TRUE(contents()->ShouldDisplayURL());
 }
 
 // Make sure that on cloning a tabcontents and going back needs_reload is false.
diff --git a/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc b/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc
index 440b975..f9b1231 100644
--- a/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/options/languages_page_gtk_unittest.cc
@@ -261,7 +261,7 @@ TEST_F(LanguagesPageGtkTest, EnableSpellChecking) {
   gtk_button_clicked(GTK_BUTTON(page.enable_spellchecking_checkbox_));
   EXPECT_EQ(TRUE, gtk_toggle_button_get_active(
       GTK_TOGGLE_BUTTON(page.enable_spellchecking_checkbox_)));
-  EXPECT_EQ(true, profile_->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck));
+  EXPECT_TRUE(profile_->GetPrefs()->GetBoolean(prefs::kEnableSpellCheck));
 }
 
 // TODO(mattm): add EnableAutoSpellChecking test
diff --git a/chrome/browser/ui/tabs/dock_info_unittest.cc b/chrome/browser/ui/tabs/dock_info_unittest.cc
index 8bb52a5..4eff278 100644
--- a/chrome/browser/ui/tabs/dock_info_unittest.cc
+++ b/chrome/browser/ui/tabs/dock_info_unittest.cc
@@ -124,7 +124,7 @@ TEST(DockInfoTest, IsValidForPoint) {
 TEST(DockInfoTest, equals) {
   DockInfo d;
   DockInfo dd;
-  EXPECT_EQ(true, d.equals(dd));
+  EXPECT_TRUE(d.equals(dd));
   d.set_type(DockInfo::MAXIMIZE);
   EXPECT_FALSE(d.equals(dd));
 }
diff --git a/chrome/common/resource_dispatcher_unittest.cc b/chrome/common/resource_dispatcher_unittest.cc
index 2de1a07..3e846f9 100644
--- a/chrome/common/resource_dispatcher_unittest.cc
+++ b/chrome/common/resource_dispatcher_unittest.cc
@@ -293,7 +293,7 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
   virtual void SetUp() {
     ResourceDispatcherTest::SetUp();
     shared_handle_.Delete(kShmemSegmentName);
-    EXPECT_EQ(true, shared_handle_.CreateNamed(kShmemSegmentName, false, 100));
+    EXPECT_TRUE(shared_handle_.CreateNamed(kShmemSegmentName, false, 100));
   }
 
   virtual void TearDown() {
diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc
index 21beaf3..1e3b38b 100644
--- a/chrome/renderer/spellchecker/spellcheck_unittest.cc
+++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc
@@ -663,7 +663,7 @@ TEST_F(SpellCheckTest, SpellCheckText) {
         &misspelling_start,
         &misspelling_length, NULL);
 
-    EXPECT_EQ(true, result) << kTestCases[i].language;
+    EXPECT_TRUE(result) << kTestCases[i].language;
     EXPECT_EQ(0, misspelling_start);
     EXPECT_EQ(0, misspelling_length);
   }
diff --git a/chrome_frame/test/urlmon_moniker_integration_test.cc b/chrome_frame/test/urlmon_moniker_integration_test.cc
index b27b90d..4bf977f 100644
--- a/chrome_frame/test/urlmon_moniker_integration_test.cc
+++ b/chrome_frame/test/urlmon_moniker_integration_test.cc
@@ -45,8 +45,8 @@ class UrlmonMonikerTest : public testing::Test {
 };
 
 TEST_F(UrlmonMonikerTest, MonikerPatch) {
-  EXPECT_EQ(true, MonikerPatch::Initialize());
-  EXPECT_EQ(true, MonikerPatch::Initialize());  // Should be ok to call twice.
+  EXPECT_TRUE(MonikerPatch::Initialize());
+  EXPECT_TRUE(MonikerPatch::Initialize());  // Should be ok to call twice.
   MonikerPatch::Uninitialize();
 }
 
@@ -90,7 +90,7 @@ class RunTestServer : public base::Thread {
 class UrlmonMonikerTestManager {
  public:
   explicit UrlmonMonikerTestManager(const wchar_t* test_url) {
-    EXPECT_EQ(true, MonikerPatch::Initialize());
+    EXPECT_TRUE(MonikerPatch::Initialize());
   }
 
   ~UrlmonMonikerTestManager() {
diff --git a/courgette/encoded_program_fuzz_unittest.cc b/courgette/encoded_program_fuzz_unittest.cc
index 9f7e053..a869bc2 100644
--- a/courgette/encoded_program_fuzz_unittest.cc
+++ b/courgette/encoded_program_fuzz_unittest.cc
@@ -95,7 +95,7 @@ void DecodeFuzzTest::FuzzExe(const char* file_name) const {
   std::string base_buffer(reinterpret_cast<const char*>(sink.Buffer()), length);
   std::string base_output;
   bool ok = TryAssemble(base_buffer, &base_output);
-  EXPECT_EQ(true, ok);
+  EXPECT_TRUE(ok);
 
   // Now we have a good serialized EncodedProgram in |base_buffer|. Time to
   // fuzz.
diff --git a/courgette/streams_unittest.cc b/courgette/streams_unittest.cc
index e82c2d7..64c12dd 100644
--- a/courgette/streams_unittest.cc
+++ b/courgette/streams_unittest.cc
@@ -22,7 +22,7 @@ TEST(StreamsTest, SimpleWriteRead) {
 
   unsigned int value;
   bool can_read = source.ReadVarint32(&value);
-  EXPECT_EQ(true, can_read);
+  EXPECT_TRUE(can_read);
   EXPECT_EQ(kValue1, value);
   EXPECT_EQ(0U, source.Remaining());
 }
@@ -40,7 +40,7 @@ TEST(StreamsTest, SimpleWriteRead2) {
 
   char text[10] = {0};
   bool can_read = source.Read(text, 5);
-  EXPECT_EQ(true, can_read);
+  EXPECT_TRUE(can_read);
   EXPECT_EQ(0, memcmp("Hello", text, 5));
   EXPECT_EQ(0U, source.Remaining());
 }
@@ -62,11 +62,11 @@ TEST(StreamsTest, StreamSetWriteRead) {
 
   courgette::SourceStreamSet in;
   bool can_init = in.Init(collected_buffer, collected_length);
-  EXPECT_EQ(true, can_init);
+  EXPECT_TRUE(can_init);
 
   uint32 value;
   bool can_read = in.stream(3)->ReadVarint32(&value);
-  EXPECT_EQ(true, can_read);
+  EXPECT_TRUE(can_read);
   EXPECT_EQ(kValue1, value);
   EXPECT_EQ(0U, in.stream(3)->Remaining());
   EXPECT_EQ(0U, in.stream(2)->Remaining());
@@ -99,14 +99,14 @@ TEST(StreamsTest, StreamSetWriteRead2) {
 
   courgette::SourceStreamSet in;
   bool can_init = in.Init(collected.Buffer(), collected.Length());
-  EXPECT_EQ(true, can_init);
+  EXPECT_TRUE(can_init);
 
   for (size_t i = 0;  data[i] != kEnd;  i += 2) {
     size_t id = data[i];
     size_t datum = data[i + 1];
     uint32 value = 77;
     bool can_read = in.stream(id)->ReadVarint32(&value);
-    EXPECT_EQ(true, can_read);
+    EXPECT_TRUE(can_read);
     EXPECT_EQ(datum, value);
   }
 
@@ -143,11 +143,11 @@ TEST(StreamsTest, SignedVarint32) {
     int written_value = values[i];
     int32 datum;
     bool can_read = in.ReadVarint32Signed(&datum);
-    EXPECT_EQ(true, can_read);
+    EXPECT_TRUE(can_read);
     EXPECT_EQ(written_value, datum);
   }
 
-  EXPECT_EQ(true, in.Empty());
+  EXPECT_TRUE(in.Empty());
 }
 
 TEST(StreamsTest, StreamSetReadWrite) {
@@ -169,17 +169,17 @@ TEST(StreamsTest, StreamSetReadWrite) {
   out.CopyTo(&collected);
   courgette::SourceStreamSet in;
   bool can_init_in = in.Init(collected.Buffer(), collected.Length());
-  EXPECT_EQ(true, can_init_in);
+  EXPECT_TRUE(can_init_in);
 
   courgette::SourceStreamSet subset1;
   bool can_read_1 = in.ReadSet(&subset1);
-  EXPECT_EQ(true, can_read_1);
+  EXPECT_TRUE(can_read_1);
   EXPECT_FALSE(in.Empty());
 
   courgette::SourceStreamSet subset2;
   bool can_read_2 = in.ReadSet(&subset2);
-  EXPECT_EQ(true, can_read_2);
-  EXPECT_EQ(true, in.Empty());
+  EXPECT_TRUE(can_read_2);
+  EXPECT_TRUE(in.Empty());
 
   courgette::SourceStreamSet subset3;
   bool can_read_3 = in.ReadSet(&subset3);
@@ -189,15 +189,15 @@ TEST(StreamsTest, StreamSetReadWrite) {
   EXPECT_FALSE(subset1.Empty());
 
   uint32 datum;
-  EXPECT_EQ(true, subset1.stream(3)->ReadVarint32(&datum));
+  EXPECT_TRUE(subset1.stream(3)->ReadVarint32(&datum));
   EXPECT_EQ(30000U, datum);
-  EXPECT_EQ(true, subset1.stream(5)->ReadVarint32(&datum));
+  EXPECT_TRUE(subset1.stream(5)->ReadVarint32(&datum));
   EXPECT_EQ(50000U, datum);
-  EXPECT_EQ(true, subset1.Empty());
+  EXPECT_TRUE(subset1.Empty());
 
-  EXPECT_EQ(true, subset2.stream(2)->ReadVarint32(&datum));
+  EXPECT_TRUE(subset2.stream(2)->ReadVarint32(&datum));
   EXPECT_EQ(20000U, datum);
-  EXPECT_EQ(true, subset2.stream(6)->ReadVarint32(&datum));
+  EXPECT_TRUE(subset2.stream(6)->ReadVarint32(&datum));
   EXPECT_EQ(60000U, datum);
-  EXPECT_EQ(true, subset2.Empty());
+  EXPECT_TRUE(subset2.Empty());
 }
diff --git a/courgette/third_party/paged_array_unittest.cc b/courgette/third_party/paged_array_unittest.cc
index 9736ca0..f65d686 100644
--- a/courgette/third_party/paged_array_unittest.cc
+++ b/courgette/third_party/paged_array_unittest.cc
@@ -17,14 +17,14 @@ class PagedArrayTest : public testing::Test {
 TEST_F(PagedArrayTest, TestManyAllocationsDestructorFree) {
   for (int i = 0; i < kIterations; ++i) {
     courgette::PagedArray<int> a;
-    EXPECT_EQ(true, a.Allocate(kSize));
+    EXPECT_TRUE(a.Allocate(kSize));
   }
 }
 
 TEST_F(PagedArrayTest, TestManyAllocationsManualFree) {
   courgette::PagedArray<int> a;
   for (int i = 0; i < kIterations; ++i) {
-    EXPECT_EQ(true, a.Allocate(kSize));
+    EXPECT_TRUE(a.Allocate(kSize));
     a.clear();
   }
 }
diff --git a/media/audio/audio_util_unittest.cc b/media/audio/audio_util_unittest.cc
index fde2127..11e10a9 100644
--- a/media/audio/audio_util_unittest.cc
+++ b/media/audio/audio_util_unittest.cc
@@ -22,7 +22,7 @@ TEST(AudioUtilTest, AdjustVolume_u8) {
                                        1,  // channels.
                                        sizeof(samples_u8[0]),
                                        0.5f);
-  EXPECT_EQ(true, result_u8);
+  EXPECT_TRUE(result_u8);
   int expected_test = memcmp(samples_u8, expected_u8, sizeof(expected_u8));
   EXPECT_EQ(0, expected_test);
 }
@@ -35,7 +35,7 @@ TEST(AudioUtilTest, AdjustVolume_s16) {
                                         2,  // channels.
                                         sizeof(samples_s16[0]),
                                         0.25f);
-  EXPECT_EQ(true, result_s16);
+  EXPECT_TRUE(result_s16);
   int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
   EXPECT_EQ(0, expected_test);
 }
@@ -48,7 +48,7 @@ TEST(AudioUtilTest, AdjustVolume_s16_zero) {
                                         2,  // channels.
                                         sizeof(samples_s16[0]),
                                         0.0f);
-  EXPECT_EQ(true, result_s16);
+  EXPECT_TRUE(result_s16);
   int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
   EXPECT_EQ(0, expected_test);
 }
@@ -61,7 +61,7 @@ TEST(AudioUtilTest, AdjustVolume_s16_one) {
                                         2,  // channels.
                                         sizeof(samples_s16[0]),
                                         1.0f);
-  EXPECT_EQ(true, result_s16);
+  EXPECT_TRUE(result_s16);
   int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
   EXPECT_EQ(0, expected_test);
 }
@@ -74,7 +74,7 @@ TEST(AudioUtilTest, AdjustVolume_s32) {
                                         4,  // channels.
                                         sizeof(samples_s32[0]),
                                         0.25f);
-  EXPECT_EQ(true, result_s32);
+  EXPECT_TRUE(result_s32);
   int expected_test = memcmp(samples_s32, expected_s32, sizeof(expected_s32));
   EXPECT_EQ(0, expected_test);
 }
@@ -90,7 +90,7 @@ TEST(AudioUtilTest, FoldChannels_u8) {
                                         6,  // channels.
                                         sizeof(samples_u8[0]),
                                         1.0f);
-  EXPECT_EQ(true, result_u8);
+  EXPECT_TRUE(result_u8);
   int expected_test = memcmp(samples_u8, expected_u8, sizeof(expected_u8));
   EXPECT_EQ(0, expected_test);
 }
@@ -104,7 +104,7 @@ TEST(AudioUtilTest, FoldChannels_s16) {
                                         6,  // channels.
                                         sizeof(samples_s16[0]),
                                         1.00f);
-  EXPECT_EQ(true, result_s16);
+  EXPECT_TRUE(result_s16);
   int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
   EXPECT_EQ(0, expected_test);
 }
@@ -118,7 +118,7 @@ TEST(AudioUtilTest, FoldChannels_s32) {
                                         6,  // channels.
                                         sizeof(samples_s32[0]),
                                         1.00f);
-  EXPECT_EQ(true, result_s32);
+  EXPECT_TRUE(result_s32);
   int expected_test = memcmp(samples_s32, expected_s32, sizeof(expected_s32));
   EXPECT_EQ(0, expected_test);
 }
@@ -133,7 +133,7 @@ TEST(AudioUtilTest, FoldChannels71_s16) {
                                         8,  // channels.
                                         sizeof(samples_s16[0]),
                                         1.00f);
-  EXPECT_EQ(true, result_s16);
+  EXPECT_TRUE(result_s16);
   int expected_test = memcmp(samples_s16, expected_s16, sizeof(expected_s16));
   EXPECT_EQ(0, expected_test);
 }
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc
index 47b1e97..5dbde65 100644
--- a/media/omx/omx_codec_unittest.cc
+++ b/media/omx/omx_codec_unittest.cc
@@ -418,7 +418,7 @@ TEST_F(OmxCodecTest, NormalFlow) {
   EXPECT_EQ(kBufferCount - 1, static_cast<int>(input_units_.size()));
   EXPECT_EQ(1, static_cast<int>(output_units_.size()));
   EXPECT_EQ(count - 1, static_cast<int>(output_pool_.size()));
-  EXPECT_EQ(true, got_eos_);
+  EXPECT_TRUE(got_eos_);
 
   // Shutdown.
   ExpectStop();
@@ -470,7 +470,7 @@ TEST_F(OmxCodecTest, RecycleInputBuffers) {
   EXPECT_EQ(kBufferCount - 1, static_cast<int>(input_units_.size()));
   EXPECT_EQ(1, static_cast<int>(output_units_.size()));
   EXPECT_EQ(count - 1, static_cast<int>(output_pool_.size()));
-  EXPECT_EQ(true, got_eos_);
+  EXPECT_TRUE(got_eos_);
 
   // Shutdown.
   ExpectStop();
diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc
index 468c870..679afc4 100644
--- a/net/base/cert_database_nss_unittest.cc
+++ b/net/base/cert_database_nss_unittest.cc
@@ -184,8 +184,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_SSLTrust) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_SSL,
-                                         &failed));
+  EXPECT_TRUE(cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_SSL,
+                                     &failed));
 
   EXPECT_EQ(0U, failed.size());
 
@@ -216,8 +216,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_EmailTrust) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_EMAIL,
-                                         &failed));
+  EXPECT_TRUE(cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_EMAIL,
+                                     &failed));
 
   EXPECT_EQ(0U, failed.size());
 
@@ -247,8 +247,8 @@ TEST_F(CertDatabaseNSSTest, ImportCACert_ObjSignTrust) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_OBJ_SIGN,
-                                         &failed));
+  EXPECT_TRUE(cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_OBJ_SIGN,
+                                     &failed));
 
   EXPECT_EQ(0U, failed.size());
 
@@ -278,8 +278,8 @@ TEST_F(CertDatabaseNSSTest, ImportCA_NotCACert) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true,
-            cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_SSL, &failed));
+  EXPECT_TRUE(cert_db_.ImportCACerts(certs, CertDatabase::TRUSTED_SSL,
+                                     &failed));
   ASSERT_EQ(1U, failed.size());
   // Note: this compares pointers directly.  It's okay in this case because
   // ImportCACerts returns the same pointers that were passed in.  In the
@@ -302,7 +302,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchy) {
   // work (see
   // http://mxr.mozilla.org/mozilla/source/security/nss/lib/certhigh/certvfy.c#752
   // "XXX This choice of trustType seems arbitrary.")
-  EXPECT_EQ(true, cert_db_.ImportCACerts(
+  EXPECT_TRUE(cert_db_.ImportCACerts(
       certs, CertDatabase::TRUSTED_SSL | CertDatabase::TRUSTED_EMAIL,
       &failed));
 
@@ -322,7 +322,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyDupeRoot) {
 
   // First import just the root.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(
+  EXPECT_TRUE(cert_db_.ImportCACerts(
       certs, CertDatabase::TRUSTED_SSL | CertDatabase::TRUSTED_EMAIL,
       &failed));
 
@@ -337,7 +337,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyDupeRoot) {
   // Now import with the other certs in the list too.  Even though the root is
   // already present, we should still import the rest.
   failed.clear();
-  EXPECT_EQ(true, cert_db_.ImportCACerts(
+  EXPECT_TRUE(cert_db_.ImportCACerts(
       certs, CertDatabase::TRUSTED_SSL | CertDatabase::TRUSTED_EMAIL,
       &failed));
 
@@ -360,8 +360,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyUntrusted) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(certs, CertDatabase::UNTRUSTED,
-                                         &failed));
+  EXPECT_TRUE(cert_db_.ImportCACerts(certs, CertDatabase::UNTRUSTED, &failed));
 
   ASSERT_EQ(1U, failed.size());
   EXPECT_EQ("DOD CA-17", failed[0].certificate->subject().common_name);
@@ -382,7 +381,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertHierarchyTree) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(
+  EXPECT_TRUE(cert_db_.ImportCACerts(
       certs, CertDatabase::TRUSTED_SSL | CertDatabase::TRUSTED_EMAIL,
       &failed));
 
@@ -406,7 +405,7 @@ TEST_F(CertDatabaseNSSTest, ImportCACertNotHierarchy) {
 
   // Import it.
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportCACerts(
+  EXPECT_TRUE(cert_db_.ImportCACerts(
       certs, CertDatabase::TRUSTED_SSL | CertDatabase::TRUSTED_EMAIL |
       CertDatabase::TRUSTED_OBJ_SIGN, &failed));
 
@@ -434,7 +433,7 @@ TEST_F(CertDatabaseNSSTest, ImportServerCert) {
   ASSERT_EQ(2U, certs.size());
 
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportServerCert(certs, &failed));
+  EXPECT_TRUE(cert_db_.ImportServerCert(certs, &failed));
 
   EXPECT_EQ(0U, failed.size());
 
@@ -462,7 +461,7 @@ TEST_F(CertDatabaseNSSTest, ImportServerCert_SelfSigned) {
   ASSERT_TRUE(ReadCertIntoList("punycodetest.der", &certs));
 
   CertDatabase::ImportCertFailureList failed;
-  EXPECT_EQ(true, cert_db_.ImportServerCert(certs, &failed));
+  EXPECT_TRUE(cert_db_.ImportServerCert(certs, &failed));
 
   EXPECT_EQ(0U, failed.size());
 
diff --git a/net/base/ssl_config_service_win_unittest.cc b/net/base/ssl_config_service_win_unittest.cc
index 7669d99..6a87760 100644
--- a/net/base/ssl_config_service_win_unittest.cc
+++ b/net/base/ssl_config_service_win_unittest.cc
@@ -38,9 +38,9 @@ class SSLConfigServiceWinTest : public testing::Test {
 TEST(SSLConfigServiceWinTest, GetNowTest) {
   // Verify that the constructor sets the correct default values.
   net::SSLConfig config;
-  EXPECT_EQ(true, config.rev_checking_enabled);
-  EXPECT_EQ(true, config.ssl3_enabled);
-  EXPECT_EQ(true, config.tls1_enabled);
+  EXPECT_TRUE(config.rev_checking_enabled);
+  EXPECT_TRUE(config.ssl3_enabled);
+  EXPECT_TRUE(config.tls1_enabled);
 
   bool rv = net::SSLConfigServiceWin::GetSSLConfigNow(&config);
   EXPECT_TRUE(rv);
@@ -151,4 +151,3 @@ TEST(SSLConfigServiceWinTest, ObserverTest) {
   // Restore the original SSL3 setting.
   net::SSLConfigServiceWin::SetSSL3Enabled(config_save.ssl3_enabled);
 }
-
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());
diff --git a/o3d/utils/cross/file_text_reader_test.cc b/o3d/utils/cross/file_text_reader_test.cc
index 9b98c63..951e3429 100644
--- a/o3d/utils/cross/file_text_reader_test.cc
+++ b/o3d/utils/cross/file_text_reader_test.cc
@@ -121,21 +121,21 @@ TEST_F(FileTextReaderTest, StartAtBeginning) {
   FileTextReader reader(file_pointers_[0]);
   EXPECT_EQ(0U, reader.position());
   EXPECT_EQ(file_pointers_[0], reader.input());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
 }
 
 TEST_F(FileTextReaderTest, TestPeekString) {
   FileTextReader reader(file_pointers_[0]);
   EXPECT_EQ(test_string_one_.substr(0, 6), reader.PeekString(6));
   EXPECT_EQ(0U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
 }
 
 TEST_F(FileTextReaderTest, ReadsSingleCharacter) {
   FileTextReader reader(file_pointers_[0]);
   EXPECT_EQ(test_string_one_.substr(0, 1)[0], reader.ReadChar());
   EXPECT_EQ(1U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_one_.substr(1, 2), reader.PeekString(2));
   EXPECT_EQ(1U, reader.position());
 }
@@ -145,7 +145,7 @@ TEST_F(FileTextReaderTest, ReadsMultipleCharacters) {
   EXPECT_EQ(test_string_one_.substr(0, 1)[0], reader.ReadChar());
   EXPECT_EQ(test_string_one_.substr(1, 1)[0], reader.ReadChar());
   EXPECT_EQ(2U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_one_.substr(2, 2), reader.PeekString(2));
   EXPECT_EQ(2U, reader.position());
 }
@@ -154,7 +154,7 @@ TEST_F(FileTextReaderTest, ReadsFile) {
   FileTextReader reader(file_pointers_[0]);
   EXPECT_EQ(test_string_one_.substr(0, 7), reader.ReadString(7));
   EXPECT_EQ(7U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_one_.substr(7, 2), reader.PeekString(2));
   EXPECT_EQ(7U, reader.position());
 }
@@ -163,27 +163,27 @@ TEST_F(FileTextReaderTest, EmptyFile) {
   FileTextReader reader(file_pointers_[8]);
   EXPECT_EQ("", reader.PeekString(1));
   EXPECT_EQ(0U, reader.position());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(0, reader.ReadChar());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
 }
 
 TEST_F(FileTextReaderTest, TinyFile) {
   FileTextReader reader(file_pointers_[7]);
   EXPECT_EQ(test_string_short_.substr(0, 1), reader.PeekString(1));
   EXPECT_EQ(0U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_short_[0], reader.ReadChar());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
 }
 
 TEST_F(FileTextReaderTest, ReadsToEnd) {
   FileTextReader reader(file_pointers_[2]);
   EXPECT_EQ(test_string_lf_, reader.ReadToEnd());
   EXPECT_EQ(test_string_lf_.size(), reader.position());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ("", reader.ReadString(1));
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lf_.size(), reader.position());
 }
 
@@ -193,12 +193,12 @@ TEST_F(FileTextReaderTest, ReadsLinefeedFile) {
   std::string line = reader.ReadLine();
   EXPECT_EQ(test_string_one_, line);
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lf_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lf_.size(), reader.position());
 }
 
@@ -206,12 +206,12 @@ TEST_F(FileTextReaderTest, ReadsCarriageReturnFile) {
   FileTextReader reader(file_pointers_[3]);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_cr_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_cr_.size(), reader.position());
 }
 
@@ -220,12 +220,12 @@ TEST_F(FileTextReaderTest, ReadsCarriageReturnLinefeedFile) {
   FileTextReader reader(file_pointers_[4]);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 2, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_crlf_.substr(test_string_one_.size() + 2, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 2, reader.position());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_crlf_.size(), reader.position());
 }
 
@@ -233,16 +233,16 @@ TEST_F(FileTextReaderTest, ReadsLinefeedCarriageReturnFile) {
   FileTextReader reader(file_pointers_[5]);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lfcr_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lfcr_.size(), reader.position());
 }
 
@@ -250,16 +250,16 @@ TEST_F(FileTextReaderTest, ReadsLinefeedLinefeedFile) {
   FileTextReader reader(file_pointers_[6]);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lflf_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lflf_.size(), reader.position());
 }
 
diff --git a/o3d/utils/cross/string_reader_test.cc b/o3d/utils/cross/string_reader_test.cc
index 742dc56..1afab5e 100644
--- a/o3d/utils/cross/string_reader_test.cc
+++ b/o3d/utils/cross/string_reader_test.cc
@@ -88,7 +88,7 @@ TEST_F(StringReaderTest, ReadsSingleCharacter) {
   StringReader reader(test_string_one_);
   EXPECT_EQ(test_string_one_.substr(0, 1)[0], reader.ReadChar());
   EXPECT_EQ(1U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_one_.substr(1, 2), reader.PeekString(2));
   EXPECT_EQ(1U, reader.position());
 }
@@ -98,7 +98,7 @@ TEST_F(StringReaderTest, ReadsMultipleCharacters) {
   EXPECT_EQ(test_string_one_.substr(0, 1)[0], reader.ReadChar());
   EXPECT_EQ(test_string_one_.substr(1, 1)[0], reader.ReadChar());
   EXPECT_EQ(2U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_one_.substr(2, 2), reader.PeekString(2));
   EXPECT_EQ(2U, reader.position());
 }
@@ -107,7 +107,7 @@ TEST_F(StringReaderTest, ReadsString) {
   StringReader reader(test_string_one_);
   EXPECT_EQ(test_string_one_.substr(0, 7), reader.ReadString(7));
   EXPECT_EQ(7U, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_one_.substr(7, 2), reader.PeekString(2));
   EXPECT_EQ(7U, reader.position());
 }
@@ -116,9 +116,9 @@ TEST_F(StringReaderTest, ReadsToEnd) {
   StringReader reader(test_string_lf_);
   EXPECT_EQ(test_string_lf_, reader.ReadToEnd());
   EXPECT_EQ(test_string_lf_.size(), reader.position());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ("", reader.ReadString(1));
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lf_.size(), reader.position());
 }
 
@@ -128,12 +128,12 @@ TEST_F(StringReaderTest, ReadsLinefeedString) {
   std::string line = reader.ReadLine();
   EXPECT_EQ(test_string_one_, line);
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lf_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lf_.size(), reader.position());
 }
 
@@ -141,12 +141,12 @@ TEST_F(StringReaderTest, ReadsCarriageReturnString) {
   StringReader reader(test_string_cr_);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_cr_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_cr_.size(), reader.position());
 }
 
@@ -155,12 +155,12 @@ TEST_F(StringReaderTest, ReadsCarriageReturnLinefeedString) {
   StringReader reader(test_string_crlf_);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 2, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_crlf_.substr(test_string_one_.size() + 2, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 2, reader.position());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_crlf_.size(), reader.position());
 }
 
@@ -168,16 +168,16 @@ TEST_F(StringReaderTest, ReadsLinefeedCarriageReturnString) {
   StringReader reader(test_string_lfcr_);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lfcr_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lfcr_.size(), reader.position());
 }
 
@@ -185,16 +185,16 @@ TEST_F(StringReaderTest, ReadsLinefeedLinefeedString) {
   StringReader reader(test_string_lflf_);
   EXPECT_EQ(test_string_one_, reader.ReadLine());
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lflf_.substr(test_string_one_.size() + 1, 2),
             reader.PeekString(2));
   EXPECT_EQ(test_string_one_.size() + 1, reader.position());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ(test_string_two_, reader.ReadLine());
-  EXPECT_EQ(false, reader.IsAtEnd());
+  EXPECT_FALSE(reader.IsAtEnd());
   EXPECT_EQ("", reader.ReadLine());
-  EXPECT_EQ(true, reader.IsAtEnd());
+  EXPECT_TRUE(reader.IsAtEnd());
   EXPECT_EQ(test_string_lflf_.size(), reader.position());
 }
 }  // namespace o3d
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index eb0ec47..cf6fd88 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -776,11 +776,11 @@ TEST_F(ViewTest, HitTestMasks) {
   gfx::Point v2_origin = v2_bounds.origin();
 
   // Test HitTest
-  EXPECT_EQ(true, v1->HitTest(ConvertPointToView(v1, v1_centerpoint)));
-  EXPECT_EQ(true, v2->HitTest(ConvertPointToView(v2, v2_centerpoint)));
+  EXPECT_TRUE(v1->HitTest(ConvertPointToView(v1, v1_centerpoint)));
+  EXPECT_TRUE(v2->HitTest(ConvertPointToView(v2, v2_centerpoint)));
 
-  EXPECT_EQ(true, v1->HitTest(ConvertPointToView(v1, v1_origin)));
-  EXPECT_EQ(false, v2->HitTest(ConvertPointToView(v2, v2_origin)));
+  EXPECT_TRUE(v1->HitTest(ConvertPointToView(v1, v1_origin)));
+  EXPECT_FALSE(v2->HitTest(ConvertPointToView(v2, v2_origin)));
 
   // Test GetViewForPoint
   EXPECT_EQ(v1, root_view->GetViewForPoint(v1_centerpoint));
diff --git a/webkit/glue/cpp_variant_unittest.cc b/webkit/glue/cpp_variant_unittest.cc
index 43c78de..6609416 100644
--- a/webkit/glue/cpp_variant_unittest.cc
+++ b/webkit/glue/cpp_variant_unittest.cc
@@ -273,7 +273,7 @@ TEST(CppVariantTest, SetsSimpleTypesAndValues) {
   CppVariant cpp;
   cpp.Set(true);
   EXPECT_EQ(NPVariantType_Bool, cpp.type);
-  EXPECT_EQ(true, cpp.value.boolValue);
+  EXPECT_TRUE(cpp.value.boolValue);
 
   cpp.Set(5);
   EXPECT_EQ(NPVariantType_Int32, cpp.type);
diff --git a/webkit/plugins/npapi/webplugin_impl_unittest.cc b/webkit/plugins/npapi/webplugin_impl_unittest.cc
index 45d4ddc..edb35dd 100644
--- a/webkit/plugins/npapi/webplugin_impl_unittest.cc
+++ b/webkit/plugins/npapi/webplugin_impl_unittest.cc
@@ -58,7 +58,7 @@ TEST(WebPluginImplTest, PostParserSimple) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("bar", GetHeader(request, "foo"));
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
@@ -72,7 +72,7 @@ TEST(WebPluginImplTest, PostParserLongHeader) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ(100U, GetHeader(request, "foo").length());
 }
 
@@ -83,7 +83,7 @@ TEST(WebPluginImplTest, PostParserManyHeaders) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("h1", GetHeader(request, "h1"));
   EXPECT_EQ("h2", GetHeader(request, "h2"));
   EXPECT_EQ("h3", GetHeader(request, "h3"));
@@ -106,7 +106,7 @@ TEST(WebPluginImplTest, PostParserDuplicateHeaders) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
 }
 
 TEST(WebPluginImplTest, PostParserNoHeaders) {
@@ -116,7 +116,7 @@ TEST(WebPluginImplTest, PostParserNoHeaders) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ(0U, GetHeader(request, "foo").length());
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
@@ -130,7 +130,7 @@ TEST(WebPluginImplTest, PostParserNoBody) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("bar", GetHeader(request, "foo"));
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ(0U, GetHeader(request, "Content-length").length());
@@ -144,7 +144,7 @@ TEST(WebPluginImplTest, PostParserBodyWithNewLines) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ(GetBodyText(request), "\n\nabcdefg\n\nabcdefg");
 }
 
@@ -155,7 +155,7 @@ TEST(WebPluginImplTest, PostParserErrorNoBody) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
 }
 
 TEST(WebPluginImplTest, PostParserErrorEmpty) {
@@ -165,7 +165,7 @@ TEST(WebPluginImplTest, PostParserErrorEmpty) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
 }
 
 TEST(WebPluginImplTest, PostParserEmptyName) {
@@ -175,7 +175,7 @@ TEST(WebPluginImplTest, PostParserEmptyName) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("bar", GetHeader(request, "foo"));
   EXPECT_EQ("body", GetBodyText(request));
 }
@@ -187,7 +187,7 @@ TEST(WebPluginImplTest, PostParserEmptyValue) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("bar", GetHeader(request, "foo"));
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ("body", GetBodyText(request));
@@ -200,7 +200,7 @@ TEST(WebPluginImplTest, PostParserCRLF) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                        static_cast<uint32>(strlen(ex1)));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("bar", GetHeader(request, "foo"));
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ("body\r\n\r\nbody2", GetBodyText(request));
@@ -217,7 +217,7 @@ TEST(WebPluginImplTest, PostParserBodyWithBinaryData) {
   request.initialize();
   bool rv = WebPluginImpl::SetPostData(&request, ex1,
                                       sizeof(ex1)/sizeof(ex1[0]));
-  EXPECT_EQ(true, rv);
+  EXPECT_TRUE(rv);
   EXPECT_EQ("bar", GetHeader(request, "foo"));
   EXPECT_EQ(0U, GetHeader(request, "bar").length());
   EXPECT_EQ(0U, GetHeader(request, "Content-length").length());