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

8 files changed, 8 insertions, 8 deletions

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);
   }