Use EXPECT_EQ when possible.

EXPECT_RECT_EQ, EXPECT_SIZE_EQ, EXPECT_POINT_EQ, EXPECT_POINT3F_EQ
could be replaced by EXPECT_EQ.

Follow up of https://codereview.chromium.org/751453005/

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

Cr-Commit-Position: refs/heads/master@{#306913}

1 files changed, 46 insertions, 52 deletions

diff --git a/cc/base/tiling_data_unittest.cc b/cc/base/tiling_data_unittest.cc
index 667719b..732b04d 100644
--- a/cc/base/tiling_data_unittest.cc
+++ b/cc/base/tiling_data_unittest.cc
@@ -775,26 +775,23 @@ TEST(TilingDataTest, SetMaxTextureSizeBorders) {
 
 TEST(TilingDataTest, ExpandRectIgnoringBordersToTileBoundsEmpty) {
   TilingData empty_total_size(gfx::Size(0, 0), gfx::Size(8, 8), true);
-  EXPECT_RECT_EQ(
-      gfx::Rect(),
-      empty_total_size.ExpandRectIgnoringBordersToTileBounds(gfx::Rect()));
-  EXPECT_RECT_EQ(gfx::Rect(),
-                 empty_total_size.ExpandRectIgnoringBordersToTileBounds(
-                     gfx::Rect(100, 100, 100, 100)));
-  EXPECT_RECT_EQ(gfx::Rect(),
-                 empty_total_size.ExpandRectIgnoringBordersToTileBounds(
-                     gfx::Rect(100, 100)));
+  EXPECT_EQ(gfx::Rect(), empty_total_size.ExpandRectIgnoringBordersToTileBounds(
+                             gfx::Rect()));
+  EXPECT_EQ(gfx::Rect(), empty_total_size.ExpandRectIgnoringBordersToTileBounds(
+                             gfx::Rect(100, 100, 100, 100)));
+  EXPECT_EQ(gfx::Rect(), empty_total_size.ExpandRectIgnoringBordersToTileBounds(
+                             gfx::Rect(100, 100)));
 
   TilingData empty_max_texture_size(gfx::Size(8, 8), gfx::Size(0, 0), true);
-  EXPECT_RECT_EQ(gfx::Rect(),
-                 empty_max_texture_size.ExpandRectIgnoringBordersToTileBounds(
-                     gfx::Rect()));
-  EXPECT_RECT_EQ(gfx::Rect(),
-                 empty_max_texture_size.ExpandRectIgnoringBordersToTileBounds(
-                     gfx::Rect(100, 100, 100, 100)));
-  EXPECT_RECT_EQ(gfx::Rect(),
-                 empty_max_texture_size.ExpandRectIgnoringBordersToTileBounds(
-                     gfx::Rect(100, 100)));
+  EXPECT_EQ(gfx::Rect(),
+            empty_max_texture_size.ExpandRectIgnoringBordersToTileBounds(
+                gfx::Rect()));
+  EXPECT_EQ(gfx::Rect(),
+            empty_max_texture_size.ExpandRectIgnoringBordersToTileBounds(
+                gfx::Rect(100, 100, 100, 100)));
+  EXPECT_EQ(gfx::Rect(),
+            empty_max_texture_size.ExpandRectIgnoringBordersToTileBounds(
+                gfx::Rect(100, 100)));
 }
 
 TEST(TilingDataTest, ExpandRectIgnoringBordersToTileBounds) {
@@ -804,8 +801,8 @@ TEST(TilingDataTest, ExpandRectIgnoringBordersToTileBounds) {
   gfx::Rect at_origin_src(1, 1);
   gfx::Rect at_origin_result(data.TileBounds(0, 0));
   EXPECT_NE(at_origin_src, at_origin_result);
-  EXPECT_RECT_EQ(at_origin_result,
-                 data.ExpandRectIgnoringBordersToTileBounds(at_origin_src));
+  EXPECT_EQ(at_origin_result,
+            data.ExpandRectIgnoringBordersToTileBounds(at_origin_src));
 
   // Arbitrary internal rect.
   gfx::Rect rect_src(6, 6, 1, 3);
@@ -814,32 +811,30 @@ TEST(TilingDataTest, ExpandRectIgnoringBordersToTileBounds) {
   gfx::Rect rect_result(
       gfx::UnionRects(data.TileBounds(2, 2), data.TileBounds(2, 3)));
   EXPECT_NE(rect_src, rect_result);
-  EXPECT_RECT_EQ(rect_result,
-                 data.ExpandRectIgnoringBordersToTileBounds(rect_src));
+  EXPECT_EQ(rect_result, data.ExpandRectIgnoringBordersToTileBounds(rect_src));
 
   // On tile bounds does not round up to next tile (ignores the border).
   gfx::Rect border_rect_src(
       gfx::UnionRects(data.TileBounds(1, 2), data.TileBounds(3, 4)));
   gfx::Rect border_rect_result(
       gfx::UnionRects(data.TileBounds(1, 2), data.TileBounds(3, 4)));
-  EXPECT_RECT_EQ(border_rect_result,
-                 data.ExpandRectIgnoringBordersToTileBounds(border_rect_src));
+  EXPECT_EQ(border_rect_result,
+            data.ExpandRectIgnoringBordersToTileBounds(border_rect_src));
 
   // Equal to tiling rect.
-  EXPECT_RECT_EQ(gfx::Rect(data.tiling_size()),
-                 data.ExpandRectIgnoringBordersToTileBounds(
-                     gfx::Rect(data.tiling_size())));
+  EXPECT_EQ(gfx::Rect(data.tiling_size()),
+            data.ExpandRectIgnoringBordersToTileBounds(
+                gfx::Rect(data.tiling_size())));
 
   // Containing, but larger than tiling rect.
-  EXPECT_RECT_EQ(
-      gfx::Rect(data.tiling_size()),
-      data.ExpandRectIgnoringBordersToTileBounds(gfx::Rect(100, 100)));
+  EXPECT_EQ(gfx::Rect(data.tiling_size()),
+            data.ExpandRectIgnoringBordersToTileBounds(gfx::Rect(100, 100)));
 
   // Non-intersecting with tiling rect.
   gfx::Rect non_intersect(200, 200, 100, 100);
   EXPECT_FALSE(non_intersect.Intersects(gfx::Rect(data.tiling_size())));
-  EXPECT_RECT_EQ(gfx::Rect(),
-                 data.ExpandRectIgnoringBordersToTileBounds(non_intersect));
+  EXPECT_EQ(gfx::Rect(),
+            data.ExpandRectIgnoringBordersToTileBounds(non_intersect));
 
   TilingData data2(gfx::Size(8, 8), gfx::Size(32, 64), true);
 
@@ -859,7 +854,7 @@ TEST(TilingDataTest, ExpandRectToTileBounds) {
   gfx::Rect at_origin_src(1, 1);
   gfx::Rect at_origin_result(data.TileBounds(0, 0));
   EXPECT_NE(at_origin_src, at_origin_result);
-  EXPECT_RECT_EQ(at_origin_result, data.ExpandRectToTileBounds(at_origin_src));
+  EXPECT_EQ(at_origin_result, data.ExpandRectToTileBounds(at_origin_src));
 
   // Arbitrary internal rect.
   gfx::Rect rect_src(6, 6, 1, 3);
@@ -868,28 +863,27 @@ TEST(TilingDataTest, ExpandRectToTileBounds) {
   gfx::Rect rect_result(
       gfx::UnionRects(data.TileBounds(2, 2), data.TileBounds(3, 4)));
   EXPECT_NE(rect_src, rect_result);
-  EXPECT_RECT_EQ(rect_result, data.ExpandRectToTileBounds(rect_src));
+  EXPECT_EQ(rect_result, data.ExpandRectToTileBounds(rect_src));
 
   // On tile bounds rounds up to next tile (since border overlaps).
   gfx::Rect border_rect_src(
       gfx::UnionRects(data.TileBounds(1, 2), data.TileBounds(3, 4)));
   gfx::Rect border_rect_result(
       gfx::UnionRects(data.TileBounds(0, 1), data.TileBounds(4, 5)));
-  EXPECT_RECT_EQ(border_rect_result,
-                 data.ExpandRectToTileBounds(border_rect_src));
+  EXPECT_EQ(border_rect_result, data.ExpandRectToTileBounds(border_rect_src));
 
   // Equal to tiling rect.
-  EXPECT_RECT_EQ(gfx::Rect(data.tiling_size()),
-                 data.ExpandRectToTileBounds(gfx::Rect(data.tiling_size())));
+  EXPECT_EQ(gfx::Rect(data.tiling_size()),
+            data.ExpandRectToTileBounds(gfx::Rect(data.tiling_size())));
 
   // Containing, but larger than tiling rect.
-  EXPECT_RECT_EQ(gfx::Rect(data.tiling_size()),
-                 data.ExpandRectToTileBounds(gfx::Rect(100, 100)));
+  EXPECT_EQ(gfx::Rect(data.tiling_size()),
+            data.ExpandRectToTileBounds(gfx::Rect(100, 100)));
 
   // Non-intersecting with tiling rect.
   gfx::Rect non_intersect(200, 200, 100, 100);
   EXPECT_FALSE(non_intersect.Intersects(gfx::Rect(data.tiling_size())));
-  EXPECT_RECT_EQ(gfx::Rect(), data.ExpandRectToTileBounds(non_intersect));
+  EXPECT_EQ(gfx::Rect(), data.ExpandRectToTileBounds(non_intersect));
 
   TilingData data2(gfx::Size(8, 8), gfx::Size(32, 64), true);
 
@@ -953,17 +947,17 @@ TEST(TilingDataTest, LargeBorders) {
   EXPECT_EQ(35, data.TileSizeY(4));
   EXPECT_EQ(5, data.num_tiles_y());
 
-  EXPECT_RECT_EQ(gfx::Rect(70, 50), data.TileBounds(0, 0));
-  EXPECT_RECT_EQ(gfx::Rect(70, 50, 40, 20), data.TileBounds(1, 1));
-  EXPECT_RECT_EQ(gfx::Rect(110, 110, 40, 35), data.TileBounds(2, 4));
-  EXPECT_RECT_EQ(gfx::Rect(150, 70, 50, 20), data.TileBounds(3, 2));
-  EXPECT_RECT_EQ(gfx::Rect(150, 110, 50, 35), data.TileBounds(3, 4));
-
-  EXPECT_RECT_EQ(gfx::Rect(100, 80), data.TileBoundsWithBorder(0, 0));
-  EXPECT_RECT_EQ(gfx::Rect(40, 20, 100, 80), data.TileBoundsWithBorder(1, 1));
-  EXPECT_RECT_EQ(gfx::Rect(80, 80, 100, 65), data.TileBoundsWithBorder(2, 4));
-  EXPECT_RECT_EQ(gfx::Rect(120, 40, 80, 80), data.TileBoundsWithBorder(3, 2));
-  EXPECT_RECT_EQ(gfx::Rect(120, 80, 80, 65), data.TileBoundsWithBorder(3, 4));
+  EXPECT_EQ(gfx::Rect(70, 50), data.TileBounds(0, 0));
+  EXPECT_EQ(gfx::Rect(70, 50, 40, 20), data.TileBounds(1, 1));
+  EXPECT_EQ(gfx::Rect(110, 110, 40, 35), data.TileBounds(2, 4));
+  EXPECT_EQ(gfx::Rect(150, 70, 50, 20), data.TileBounds(3, 2));
+  EXPECT_EQ(gfx::Rect(150, 110, 50, 35), data.TileBounds(3, 4));
+
+  EXPECT_EQ(gfx::Rect(100, 80), data.TileBoundsWithBorder(0, 0));
+  EXPECT_EQ(gfx::Rect(40, 20, 100, 80), data.TileBoundsWithBorder(1, 1));
+  EXPECT_EQ(gfx::Rect(80, 80, 100, 65), data.TileBoundsWithBorder(2, 4));
+  EXPECT_EQ(gfx::Rect(120, 40, 80, 80), data.TileBoundsWithBorder(3, 2));
+  EXPECT_EQ(gfx::Rect(120, 80, 80, 65), data.TileBoundsWithBorder(3, 4));
 
   EXPECT_EQ(0, data.TileXIndexFromSrcCoord(0));
   EXPECT_EQ(0, data.TileXIndexFromSrcCoord(69));