ui: Build fix for gcc 4.6.3, default version of ubuntu 12.04.

EXPECT_EQ(true, ...) or EXPECT_EQ(false, ...) cause errors like:

$ converting 'true' to pointer type for argument 1 of '...'.

Switch us to use EXPECT_TRUE/EXPECT_FALSE where appropriate.

This came from https://codereview.chromium.org/11141010/ (r161762).

TBR=sky@chromium.org

Review URL: https://codereview.chromium.org/11139009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162727 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 117 insertions, 117 deletions

diff --git a/ui/base/ime/input_method_ibus_unittest.cc b/ui/base/ime/input_method_ibus_unittest.cc
index cc71978..d926048 100644
--- a/ui/base/ime/input_method_ibus_unittest.cc
+++ b/ui/base/ime/input_method_ibus_unittest.cc
@@ -316,7 +316,7 @@ TEST_F(InputMethodIBusTest, GetInputTextType) {
 
 TEST_F(InputMethodIBusTest, CanComposeInline) {
   ime_->Init(true);
-  EXPECT_EQ(true, ime_->CanComposeInline());
+  EXPECT_TRUE(ime_->CanComposeInline());
   can_compose_inline_ = false;
   ime_->OnTextInputTypeChanged(this);
   EXPECT_FALSE(ime_->CanComposeInline());
diff --git a/ui/gfx/point_unittest.cc b/ui/gfx/point_unittest.cc
index 028c10a..cae2166 100644
--- a/ui/gfx/point_unittest.cc
+++ b/ui/gfx/point_unittest.cc
@@ -10,22 +10,23 @@
 
 namespace ui {
 
-static int test_pointf(const gfx::PointF& p) {
+namespace {
+
+int TestPointF(const gfx::PointF& p) {
   return p.x();
 }
 
+}  // namespace
+
 TEST(PointTest, ToPointF) {
   // Check that implicit conversion from integer to float compiles.
   gfx::Point a(10, 20);
-  float x = test_pointf(a);
+  float x = TestPointF(a);
   EXPECT_EQ(x, a.x());
 
   gfx::PointF b(10, 20);
-  bool equals = a == b;
-  EXPECT_EQ(true, equals);
-
-  equals = b == a;
-  EXPECT_EQ(true, equals);
+  EXPECT_EQ(a, b);
+  EXPECT_EQ(b, a);
 }
 
 TEST(PointTest, IsOrigin) {
diff --git a/ui/gfx/rect_unittest.cc b/ui/gfx/rect_unittest.cc
index a19d785..6697e08 100644
--- a/ui/gfx/rect_unittest.cc
+++ b/ui/gfx/rect_unittest.cc
@@ -575,11 +575,8 @@ TEST(RectTest, ToRectF) {
   gfx::RectF intersect = b.Intersect(a);
   EXPECT_EQ(b.ToString(), intersect.ToString());
 
-  bool equals = a == b;
-  EXPECT_EQ(true, equals);
-
-  equals = b == a;
-  EXPECT_EQ(true, equals);
+  EXPECT_EQ(a, b);
+  EXPECT_EQ(b, a);
 }
 
 }  // namespace ui
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 447b02c..7b23dbe 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -100,7 +100,7 @@ TEST_F(RenderTextTest, CustomDefaultStyle) {
   render_text->set_default_style(strike);
   render_text->ApplyDefaultStyle();
   EXPECT_EQ(1U, render_text->style_ranges().size());
-  EXPECT_EQ(true, render_text->style_ranges()[0].strike);
+  EXPECT_TRUE(render_text->style_ranges()[0].strike);
   EXPECT_EQ(strike.foreground, render_text->style_ranges()[0].foreground);
 }
 
diff --git a/ui/gfx/size_unittest.cc b/ui/gfx/size_unittest.cc
index 119764f..4a281ed 100644
--- a/ui/gfx/size_unittest.cc
+++ b/ui/gfx/size_unittest.cc
@@ -11,127 +11,129 @@
 
 namespace ui {
 
-static int test_sizef(const gfx::SizeF& s) {
+namespace {
+
+int TestSizeF(const gfx::SizeF& s) {
   return s.width();
 }
 
+}  // namespace
+
 TEST(SizeTest, ToSizeF) {
   // Check that implicit conversion from integer to float compiles.
   gfx::Size a(10, 20);
-  float width = test_sizef(a);
+  float width = TestSizeF(a);
   EXPECT_EQ(width, a.width());
 
   gfx::SizeF b(10, 20);
-  bool equals = a == b;
-  EXPECT_EQ(true, equals);
 
-  equals = b == a;
-  EXPECT_EQ(true, equals);
+  EXPECT_EQ(a, b);
+  EXPECT_EQ(b, a);
 }
 
 TEST(SizeTest, ToFlooredSize) {
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToFlooredSize(gfx::SizeF(0, 0)));
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToFlooredSize(gfx::SizeF(0.0001f, 0.0001f)));
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToFlooredSize(gfx::SizeF(0.4999f, 0.4999f)));
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToFlooredSize(gfx::SizeF(0.5f, 0.5f)));
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToFlooredSize(gfx::SizeF(0.9999f, 0.9999f)));
-
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToFlooredSize(gfx::SizeF(10, 10)));
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToFlooredSize(gfx::SizeF(10.0001f, 10.0001f)));
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToFlooredSize(gfx::SizeF(10.4999f, 10.4999f)));
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToFlooredSize(gfx::SizeF(10.5f, 10.5f)));
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToFlooredSize(gfx::SizeF(10.9999f, 10.9999f)));
-
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToFlooredSize(gfx::SizeF(-10, -10)));
-    EXPECT_EQ(gfx::Size(-11, -11),
-              gfx::ToFlooredSize(gfx::SizeF(-10.0001f, -10.0001f)));
-    EXPECT_EQ(gfx::Size(-11, -11),
-              gfx::ToFlooredSize(gfx::SizeF(-10.4999f, -10.4999f)));
-    EXPECT_EQ(gfx::Size(-11, -11),
-              gfx::ToFlooredSize(gfx::SizeF(-10.5f, -10.5f)));
-    EXPECT_EQ(gfx::Size(-11, -11),
-              gfx::ToFlooredSize(gfx::SizeF(-10.9999f, -10.9999f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToFlooredSize(gfx::SizeF(0, 0)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToFlooredSize(gfx::SizeF(0.0001f, 0.0001f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToFlooredSize(gfx::SizeF(0.4999f, 0.4999f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToFlooredSize(gfx::SizeF(0.5f, 0.5f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToFlooredSize(gfx::SizeF(0.9999f, 0.9999f)));
+
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToFlooredSize(gfx::SizeF(10, 10)));
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToFlooredSize(gfx::SizeF(10.0001f, 10.0001f)));
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToFlooredSize(gfx::SizeF(10.4999f, 10.4999f)));
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToFlooredSize(gfx::SizeF(10.5f, 10.5f)));
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToFlooredSize(gfx::SizeF(10.9999f, 10.9999f)));
+
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToFlooredSize(gfx::SizeF(-10, -10)));
+  EXPECT_EQ(gfx::Size(-11, -11),
+            gfx::ToFlooredSize(gfx::SizeF(-10.0001f, -10.0001f)));
+  EXPECT_EQ(gfx::Size(-11, -11),
+            gfx::ToFlooredSize(gfx::SizeF(-10.4999f, -10.4999f)));
+  EXPECT_EQ(gfx::Size(-11, -11),
+            gfx::ToFlooredSize(gfx::SizeF(-10.5f, -10.5f)));
+  EXPECT_EQ(gfx::Size(-11, -11),
+            gfx::ToFlooredSize(gfx::SizeF(-10.9999f, -10.9999f)));
 }
 
 TEST(SizeTest, ToCeiledSize) {
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToCeiledSize(gfx::SizeF(0, 0)));
-    EXPECT_EQ(gfx::Size(1, 1),
-              gfx::ToCeiledSize(gfx::SizeF(0.0001f, 0.0001f)));
-    EXPECT_EQ(gfx::Size(1, 1),
-              gfx::ToCeiledSize(gfx::SizeF(0.4999f, 0.4999f)));
-    EXPECT_EQ(gfx::Size(1, 1),
-              gfx::ToCeiledSize(gfx::SizeF(0.5f, 0.5f)));
-    EXPECT_EQ(gfx::Size(1, 1),
-              gfx::ToCeiledSize(gfx::SizeF(0.9999f, 0.9999f)));
-
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToCeiledSize(gfx::SizeF(10, 10)));
-    EXPECT_EQ(gfx::Size(11, 11),
-              gfx::ToCeiledSize(gfx::SizeF(10.0001f, 10.0001f)));
-    EXPECT_EQ(gfx::Size(11, 11),
-              gfx::ToCeiledSize(gfx::SizeF(10.4999f, 10.4999f)));
-    EXPECT_EQ(gfx::Size(11, 11),
-              gfx::ToCeiledSize(gfx::SizeF(10.5f, 10.5f)));
-    EXPECT_EQ(gfx::Size(11, 11),
-              gfx::ToCeiledSize(gfx::SizeF(10.9999f, 10.9999f)));
-
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToCeiledSize(gfx::SizeF(-10, -10)));
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToCeiledSize(gfx::SizeF(-10.0001f, -10.0001f)));
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToCeiledSize(gfx::SizeF(-10.4999f, -10.4999f)));
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToCeiledSize(gfx::SizeF(-10.5f, -10.5f)));
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToCeiledSize(gfx::SizeF(-10.9999f, -10.9999f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToCeiledSize(gfx::SizeF(0, 0)));
+  EXPECT_EQ(gfx::Size(1, 1),
+            gfx::ToCeiledSize(gfx::SizeF(0.0001f, 0.0001f)));
+  EXPECT_EQ(gfx::Size(1, 1),
+            gfx::ToCeiledSize(gfx::SizeF(0.4999f, 0.4999f)));
+  EXPECT_EQ(gfx::Size(1, 1),
+            gfx::ToCeiledSize(gfx::SizeF(0.5f, 0.5f)));
+  EXPECT_EQ(gfx::Size(1, 1),
+            gfx::ToCeiledSize(gfx::SizeF(0.9999f, 0.9999f)));
+
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToCeiledSize(gfx::SizeF(10, 10)));
+  EXPECT_EQ(gfx::Size(11, 11),
+            gfx::ToCeiledSize(gfx::SizeF(10.0001f, 10.0001f)));
+  EXPECT_EQ(gfx::Size(11, 11),
+            gfx::ToCeiledSize(gfx::SizeF(10.4999f, 10.4999f)));
+  EXPECT_EQ(gfx::Size(11, 11),
+            gfx::ToCeiledSize(gfx::SizeF(10.5f, 10.5f)));
+  EXPECT_EQ(gfx::Size(11, 11),
+            gfx::ToCeiledSize(gfx::SizeF(10.9999f, 10.9999f)));
+
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToCeiledSize(gfx::SizeF(-10, -10)));
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToCeiledSize(gfx::SizeF(-10.0001f, -10.0001f)));
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToCeiledSize(gfx::SizeF(-10.4999f, -10.4999f)));
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToCeiledSize(gfx::SizeF(-10.5f, -10.5f)));
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToCeiledSize(gfx::SizeF(-10.9999f, -10.9999f)));
 }
 
 TEST(SizeTest, ToRoundedSize) {
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToRoundedSize(gfx::SizeF(0, 0)));
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToRoundedSize(gfx::SizeF(0.0001f, 0.0001f)));
-    EXPECT_EQ(gfx::Size(0, 0),
-              gfx::ToRoundedSize(gfx::SizeF(0.4999f, 0.4999f)));
-    EXPECT_EQ(gfx::Size(1, 1),
-              gfx::ToRoundedSize(gfx::SizeF(0.5f, 0.5f)));
-    EXPECT_EQ(gfx::Size(1, 1),
-              gfx::ToRoundedSize(gfx::SizeF(0.9999f, 0.9999f)));
-
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToRoundedSize(gfx::SizeF(10, 10)));
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToRoundedSize(gfx::SizeF(10.0001f, 10.0001f)));
-    EXPECT_EQ(gfx::Size(10, 10),
-              gfx::ToRoundedSize(gfx::SizeF(10.4999f, 10.4999f)));
-    EXPECT_EQ(gfx::Size(11, 11),
-              gfx::ToRoundedSize(gfx::SizeF(10.5f, 10.5f)));
-    EXPECT_EQ(gfx::Size(11, 11),
-              gfx::ToRoundedSize(gfx::SizeF(10.9999f, 10.9999f)));
-
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToRoundedSize(gfx::SizeF(-10, -10)));
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToRoundedSize(gfx::SizeF(-10.0001f, -10.0001f)));
-    EXPECT_EQ(gfx::Size(-10, -10),
-              gfx::ToRoundedSize(gfx::SizeF(-10.4999f, -10.4999f)));
-    EXPECT_EQ(gfx::Size(-11, -11),
-              gfx::ToRoundedSize(gfx::SizeF(-10.5f, -10.5f)));
-    EXPECT_EQ(gfx::Size(-11, -11),
-              gfx::ToRoundedSize(gfx::SizeF(-10.9999f, -10.9999f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToRoundedSize(gfx::SizeF(0, 0)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToRoundedSize(gfx::SizeF(0.0001f, 0.0001f)));
+  EXPECT_EQ(gfx::Size(0, 0),
+            gfx::ToRoundedSize(gfx::SizeF(0.4999f, 0.4999f)));
+  EXPECT_EQ(gfx::Size(1, 1),
+            gfx::ToRoundedSize(gfx::SizeF(0.5f, 0.5f)));
+  EXPECT_EQ(gfx::Size(1, 1),
+            gfx::ToRoundedSize(gfx::SizeF(0.9999f, 0.9999f)));
+
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToRoundedSize(gfx::SizeF(10, 10)));
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToRoundedSize(gfx::SizeF(10.0001f, 10.0001f)));
+  EXPECT_EQ(gfx::Size(10, 10),
+            gfx::ToRoundedSize(gfx::SizeF(10.4999f, 10.4999f)));
+  EXPECT_EQ(gfx::Size(11, 11),
+            gfx::ToRoundedSize(gfx::SizeF(10.5f, 10.5f)));
+  EXPECT_EQ(gfx::Size(11, 11),
+            gfx::ToRoundedSize(gfx::SizeF(10.9999f, 10.9999f)));
+
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToRoundedSize(gfx::SizeF(-10, -10)));
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToRoundedSize(gfx::SizeF(-10.0001f, -10.0001f)));
+  EXPECT_EQ(gfx::Size(-10, -10),
+            gfx::ToRoundedSize(gfx::SizeF(-10.4999f, -10.4999f)));
+  EXPECT_EQ(gfx::Size(-11, -11),
+            gfx::ToRoundedSize(gfx::SizeF(-10.5f, -10.5f)));
+  EXPECT_EQ(gfx::Size(-11, -11),
+            gfx::ToRoundedSize(gfx::SizeF(-10.9999f, -10.9999f)));
 }
 
 }  // namespace ui
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 2c661b4..8b1d54e 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -348,7 +348,7 @@ TEST_F(ViewTest, OnBoundsChanged) {
   v.Reset();
   v.SetBoundsRect(new_rect);
 
-  EXPECT_EQ(v.did_change_bounds_, true);
+  EXPECT_TRUE(v.did_change_bounds_);
   EXPECT_EQ(v.new_bounds_, new_rect);
   EXPECT_EQ(v.bounds(), new_rect);
 }