| Index: ui/views/controls/label_unittest.cc
|
| diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
|
| index be752810f3b6c2932df77ec91ccaa565cc78c418..7404dd39699e3cc57cea43496b39514d62458b0c 100644
|
| --- a/ui/views/controls/label_unittest.cc
|
| +++ b/ui/views/controls/label_unittest.cc
|
| @@ -220,7 +220,7 @@ TEST(LabelTest, MultiLineSizing) {
|
| label.SizeToFit(required_width - 1);
|
| int constrained_width = label.GetLocalBounds().width();
|
| #if defined(OS_WIN)
|
| - // Canvas::SizeStringInt (in ui/gfx/canvas_linux.cc)
|
| + // Canvas::SizeStringToFit (in ui/gfx/canvas_linux.cc)
|
| // has to be fixed to return the size that fits to given width/height.
|
| EXPECT_LT(constrained_width, required_width);
|
| #endif
|
| @@ -235,7 +235,7 @@ TEST(LabelTest, MultiLineSizing) {
|
| EXPECT_GT(required_height, kMinTextDimension);
|
| int height_for_constrained_width = label.GetHeightForWidth(constrained_width);
|
| #if defined(OS_WIN)
|
| - // Canvas::SizeStringInt (in ui/gfx/canvas_linux.cc)
|
| + // Canvas::SizeStringToFit (in ui/gfx/canvas_linux.cc)
|
| // has to be fixed to return the size that fits to given width/height.
|
| EXPECT_GT(height_for_constrained_width, required_height);
|
| #endif
|
| @@ -267,7 +267,7 @@ TEST(LabelTest, MultiLineSizing) {
|
| // is shrunk.
|
| int height1 = label.GetHeightForWidth(required_width_with_border - 1);
|
| #if defined(OS_WIN)
|
| - // Canvas::SizeStringInt (in ui/gfx/canvas_linux.cc)
|
| + // Canvas::SizeStringToFit (in ui/gfx/canvas_linux.cc)
|
| // has to be fixed to return the size that fits to given width/height.
|
| EXPECT_GT(height1, required_height_with_border);
|
| #endif
|
|
|