linux_aura: Fix the insets on LabelButtons.

chrome/browser/ui/views/toolbar/back_button.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 "chrome/browser/ui/views/toolbar/back_button.h"
 
 #include "ui/gfx/insets.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/painter.h"
 
@@ skipping 20 matching lines @@
   // TODO(gbillock): Refactor this magic number somewhere global to views,
   // probably a FocusBorder constant.
   const int kFocusRectInset = 3;
   SetFocusPainter(views::Painter::CreateDashedFocusPainterWithInsets(
                       gfx::Insets(kFocusRectInset, kFocusRectInset + margin,
                                   kFocusRectInset, kFocusRectInset)));
 
   InvalidateLayout();
 }
 
-scoped_ptr<views::Border> BackButton::CreateDefaultBorder() const {
+scoped_ptr<views::LabelButtonBorder> BackButton::CreateDefaultBorder() const {
+  scoped_ptr<views::LabelButtonBorder> border =
+      ToolbarButton::CreateDefaultBorder();
+
   // Adjust border insets to follow the margin change,
   // which will be reflected in where the border is painted
   // through |GetThemePaintRect|.
-  scoped_ptr<views::LabelButtonBorder> border(
-      new views::LabelButtonBorder(style()));
   const gfx::Insets insets(border->GetInsets());
   border->set_insets(gfx::Insets(insets.top(), insets.left() + margin_leading_,
                                  insets.bottom(), insets.right()));
-  return border.PassAs<views::Border>();
+
+  return border.Pass();
 }