Index: ui/gfx/size_unittest.cc |
diff --git a/ui/gfx/size_unittest.cc b/ui/gfx/size_unittest.cc |
index e68bdd61d38b10f9321786df8aa18d4d69f446d9..9f109b3f04b1f832eb1e68439244949b1e9facae 100644 |
--- a/ui/gfx/size_unittest.cc |
+++ b/ui/gfx/size_unittest.cc |
@@ -78,24 +78,24 @@ TEST(SizeTest, ClampSize) { |
a = Size(3, 5); |
EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); |
- a.ClampToMin(Size(2, 4)); |
+ a.SetToMax(Size(2, 4)); |
EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); |
- a.ClampToMin(Size(3, 5)); |
+ a.SetToMax(Size(3, 5)); |
EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); |
- a.ClampToMin(Size(4, 2)); |
+ a.SetToMax(Size(4, 2)); |
EXPECT_EQ(Size(4, 5).ToString(), a.ToString()); |
- a.ClampToMin(Size(8, 10)); |
+ a.SetToMax(Size(8, 10)); |
EXPECT_EQ(Size(8, 10).ToString(), a.ToString()); |
- a.ClampToMax(Size(9, 11)); |
+ a.SetToMin(Size(9, 11)); |
EXPECT_EQ(Size(8, 10).ToString(), a.ToString()); |
- a.ClampToMax(Size(8, 10)); |
+ a.SetToMin(Size(8, 10)); |
EXPECT_EQ(Size(8, 10).ToString(), a.ToString()); |
- a.ClampToMax(Size(11, 9)); |
+ a.SetToMin(Size(11, 9)); |
EXPECT_EQ(Size(8, 9).ToString(), a.ToString()); |
- a.ClampToMax(Size(7, 11)); |
+ a.SetToMin(Size(7, 11)); |
EXPECT_EQ(Size(7, 9).ToString(), a.ToString()); |
- a.ClampToMax(Size(3, 5)); |
+ a.SetToMin(Size(3, 5)); |
EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); |
} |
@@ -104,24 +104,24 @@ TEST(SizeTest, ClampSizeF) { |
a = SizeF(3.5f, 5.5f); |
EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); |
- a.ClampToMin(SizeF(2.5f, 4.5f)); |
+ a.SetToMax(SizeF(2.5f, 4.5f)); |
EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); |
- a.ClampToMin(SizeF(3.5f, 5.5f)); |
+ a.SetToMax(SizeF(3.5f, 5.5f)); |
EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); |
- a.ClampToMin(SizeF(4.5f, 2.5f)); |
+ a.SetToMax(SizeF(4.5f, 2.5f)); |
EXPECT_EQ(SizeF(4.5f, 5.5f).ToString(), a.ToString()); |
- a.ClampToMin(SizeF(8.5f, 10.5f)); |
+ a.SetToMax(SizeF(8.5f, 10.5f)); |
EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); |
- a.ClampToMax(SizeF(9.5f, 11.5f)); |
+ a.SetToMin(SizeF(9.5f, 11.5f)); |
EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); |
- a.ClampToMax(SizeF(8.5f, 10.5f)); |
+ a.SetToMin(SizeF(8.5f, 10.5f)); |
EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); |
- a.ClampToMax(SizeF(11.5f, 9.5f)); |
+ a.SetToMin(SizeF(11.5f, 9.5f)); |
EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString()); |
- a.ClampToMax(SizeF(7.5f, 11.5f)); |
+ a.SetToMin(SizeF(7.5f, 11.5f)); |
EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString()); |
- a.ClampToMax(SizeF(3.5f, 5.5f)); |
+ a.SetToMin(SizeF(3.5f, 5.5f)); |
EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); |
} |