Use EXPECT_EQ when possible.

cc/test/layer_tree_json_parser_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/test/layer_tree_json_parser.h"
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 
 namespace {
 
 bool LayerTreesMatch(LayerImpl* const layer_impl,
                      Layer* const layer) {
 #define RETURN_IF_EXPECTATION_FAILS(exp) \
   do { \
     exp; \
     if (testing::UnitTest::GetInstance()->current_test_info()-> \
             result()->Failed()) \
       return false; \
   } while (0)
 
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->children().size(),
                                         layer->children().size()));
-  RETURN_IF_EXPECTATION_FAILS(EXPECT_SIZE_EQ(layer_impl->bounds(),
-                                             layer->bounds()));
-  RETURN_IF_EXPECTATION_FAILS(EXPECT_POINT_EQ(layer_impl->position(),
-                                              layer->position()));
+  RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->bounds(), layer->bounds()));
+  RETURN_IF_EXPECTATION_FAILS(
+      EXPECT_EQ(layer_impl->position(), layer->position()));
   RETURN_IF_EXPECTATION_FAILS(
       EXPECT_TRANSFORMATION_MATRIX_EQ(layer_impl->draw_transform(),
                                       layer->draw_transform()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->contents_opaque(),
                                         layer->contents_opaque()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->scrollable(),
                                         layer->scrollable()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_FLOAT_EQ(layer_impl->opacity(),
                                               layer->opacity()));
   RETURN_IF_EXPECTATION_FAILS(EXPECT_EQ(layer_impl->have_wheel_event_handlers(),
@@ skipping 68 matching lines @@
   root_impl->AddChild(touch_layer.Pass());
   tree->SetRootLayer(root_impl.Pass());
 
   std::string json = host_impl.LayerTreeAsJson();
   scoped_refptr<Layer> root = ParseTreeFromJson(json, NULL);
   ASSERT_TRUE(root.get());
   EXPECT_TRUE(LayerTreesMatch(host_impl.RootLayer(), root.get()));
 }
 
 }  // namespace cc