| Index: ui/views/controls/label_unittest.cc
|
| diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc
|
| index 640b9d6297c7d6193607e6861df9cf03fb669d44..1bdb2388a4d7968e623c5c4263304a6b67cd1cd5 100644
|
| --- a/ui/views/controls/label_unittest.cc
|
| +++ b/ui/views/controls/label_unittest.cc
|
| @@ -169,7 +169,7 @@ TEST(LabelTest, SingleLineSizing) {
|
|
|
| // Test everything with borders.
|
| gfx::Insets border(10, 20, 30, 40);
|
| - label.set_border(Border::CreateEmptyBorder(border.top(),
|
| + label.SetBorder(Border::CreateEmptyBorder(border.top(),
|
| border.left(),
|
| border.bottom(),
|
| border.right()));
|
| @@ -250,7 +250,7 @@ TEST(LabelTest, MultiLineSizing) {
|
|
|
| // Test everything with borders.
|
| gfx::Insets border(10, 20, 30, 40);
|
| - label.set_border(Border::CreateEmptyBorder(border.top(),
|
| + label.SetBorder(Border::CreateEmptyBorder(border.top(),
|
| border.left(),
|
| border.bottom(),
|
| border.right()));
|
| @@ -391,7 +391,7 @@ TEST(LabelTest, DrawSingleLineString) {
|
|
|
| // Test single line drawing with a border.
|
| gfx::Insets border(39, 34, 8, 96);
|
| - label.set_border(Border::CreateEmptyBorder(border.top(),
|
| + label.SetBorder(Border::CreateEmptyBorder(border.top(),
|
| border.left(),
|
| border.bottom(),
|
| border.right()));
|
| @@ -534,7 +534,7 @@ TEST(LabelTest, DrawMultiLineString) {
|
|
|
| // Test multiline drawing with a border.
|
| gfx::Insets border(19, 92, 23, 2);
|
| - label.set_border(Border::CreateEmptyBorder(border.top(),
|
| + label.SetBorder(Border::CreateEmptyBorder(border.top(),
|
| border.left(),
|
| border.bottom(),
|
| border.right()));
|
| @@ -668,7 +668,7 @@ TEST(LabelTest, DrawSingleLineStringInRTL) {
|
|
|
| // Test single line drawing with a border.
|
| gfx::Insets border(39, 34, 8, 96);
|
| - label.set_border(Border::CreateEmptyBorder(border.top(),
|
| + label.SetBorder(Border::CreateEmptyBorder(border.top(),
|
| border.left(),
|
| border.bottom(),
|
| border.right()));
|
| @@ -817,7 +817,7 @@ TEST(LabelTest, DrawMultiLineStringInRTL) {
|
|
|
| // Test multiline drawing with a border.
|
| gfx::Insets border(19, 92, 23, 2);
|
| - label.set_border(Border::CreateEmptyBorder(border.top(),
|
| + label.SetBorder(Border::CreateEmptyBorder(border.top(),
|
| border.left(),
|
| border.bottom(),
|
| border.right()));
|
|
|