Add bottom border to StyledLabel.

ui/views/controls/styled_label_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 "ui/views/controls/styled_label.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 544 matching lines @@
   // layout should be recalculated
   // all controls should be recreated
   styled()->SetText(another_text);
   int updated_height = styled()->GetHeightForWidth(styled()->width());
   EXPECT_NE(updated_height, real_height);
   View* first_child_after_text_update = styled()->has_children() ?
       styled()->child_at(0) : nullptr;
   EXPECT_NE(first_child_after_text_update, first_child_after_layout);
 }
 
+TEST_F(StyledLabelTest, Border) {
+  const std::string text("One line");
+  InitStyledLabel(text);
+  Label label(ASCIIToUTF16(text));
+  gfx::Size label_preferred_size = label.GetPreferredSize();
+  styled()->SetBorder(
+      CreateEmptyBorder(5 /*top*/, 10 /*left*/, 6 /*bottom*/, 20 /*right*/));
+  styled()->SetBounds(0, 0, 1000, 0);
+  styled()->Layout();
+  EXPECT_EQ(
+      label_preferred_size.height() + 5 /*top border*/ + 6 /*bottom border*/,
+      styled()->GetPreferredSize().height());
+  EXPECT_EQ(
+      label_preferred_size.width() + 10 /*left border*/ + 20 /*right border*/,
+      styled()->GetPreferredSize().width());
+}
+
 }  // namespace views