Fix new avatar button appearance regressions.

ui/views/controls/label.cc

Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 00bc751f62c9d44aca234e124d92194d4005bab5..648a0e660bcfd986d92ff25d08f8959f606297db 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -321,11 +321,6 @@ void Label::PaintText(gfx::Canvas* canvas,
   } else {
     canvas->DrawStringRectWithShadows(text, font_list_, color, text_bounds,
                                       line_height_, flags, shadows_);
-
-    if (SkColorGetA(halo_color_) != SK_AlphaTRANSPARENT) {
-      canvas->DrawStringRectWithHalo(text, font_list_, color, halo_color_,
-                                     text_bounds, flags);
-    }
   }
 
   if (HasFocus()) {
@@ -352,6 +347,8 @@ gfx::Size Label::GetTextSize() const {
     gfx::Canvas::SizeStringInt(
         layout_text(), font_list_, &w, &h, line_height_, flags);
     text_size_.SetSize(w, h);
+    const gfx::Insets shadow_margin = -gfx::ShadowValue::GetMargin(shadows_);
+    text_size_.Enlarge(shadow_margin.width(), shadow_margin.height());
     text_size_valid_ = true;
   }
 
@@ -394,7 +391,6 @@ void Label::Init(const base::string16& text, const gfx::FontList& font_list) {
   elide_behavior_ = gfx::ELIDE_TAIL;
   collapse_when_hidden_ = false;
   directionality_mode_ = gfx::DIRECTIONALITY_FROM_UI;
-  halo_color_ = SK_ColorTRANSPARENT;
   cached_heights_.resize(kCachedSizeLimit);
   ResetCachedSize();