| Index: cc/layer_unittest.cc
|
| diff --git a/cc/layer_unittest.cc b/cc/layer_unittest.cc
|
| index cfd62cc62faa41de57d30f842866e14082aa1a9f..d110c4162cf3f24c0720e3e34b80fd189781d468 100644
|
| --- a/cc/layer_unittest.cc
|
| +++ b/cc/layer_unittest.cc
|
| @@ -18,6 +18,7 @@
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/gfx/transform.h"
|
| +#include "ui/gfx/transform_util.h"
|
|
|
| using ::testing::AnyNumber;
|
| using ::testing::AtLeast;
|
| @@ -533,12 +534,12 @@ TEST_F(LayerTest, checkPropertyChangeCausesCorrectBehavior)
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setOpacity(0.5));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setContentsOpaque(true));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setPosition(gfx::PointF(4, 9)));
|
| - EXPECT_SET_NEEDS_COMMIT(1, testLayer->setSublayerTransform(MathUtil::createGfxTransform(0, 0, 0, 0, 0, 0)));
|
| + EXPECT_SET_NEEDS_COMMIT(1, testLayer->setSublayerTransform(gfx::CreateGfxTransform(0, 0, 0, 0, 0, 0)));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setScrollable(true));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setShouldScrollOnMainThread(true));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setNonFastScrollableRegion(gfx::Rect(1, 1, 2, 2)));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setHaveWheelEventHandlers(true));
|
| - EXPECT_SET_NEEDS_COMMIT(1, testLayer->setTransform(MathUtil::createGfxTransform(0, 0, 0, 0, 0, 0)));
|
| + EXPECT_SET_NEEDS_COMMIT(1, testLayer->setTransform(gfx::CreateGfxTransform(0, 0, 0, 0, 0, 0)));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setDoubleSided(false));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setDebugName("Test Layer"));
|
| EXPECT_SET_NEEDS_COMMIT(1, testLayer->setDrawCheckerboardForMissingTiles(!testLayer->drawCheckerboardForMissingTiles()));
|
|
|