Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/controls/button/label_button.cc

Index: ui/views/controls/button/label_button.cc
diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
index 70a2f10e09b05d2748f2d52d9871398c35868586..b1eefcd9e767625c7b5035f5d4521162e4091bd8 100644
--- a/ui/views/controls/button/label_button.cc
+++ b/ui/views/controls/button/label_button.cc
@@ -26,9 +26,9 @@
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/layout/views_layout_delegate.h"
 #include "ui/views/painter.h"
 #include "ui/views/style/platform_style.h"
-#include "ui/views/views_delegate.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace {
@@ -92,7 +92,7 @@ LabelButton::LabelButton(ButtonListener* listener, const base::string16& text)
       is_default_(false),
       style_(STYLE_TEXTBUTTON),
       border_is_themed_border_(true),
-      image_label_spacing_(ViewsDelegate::GetInstance()->GetDistanceMetric(
+      image_label_spacing_(ViewsLayoutDelegate::Get()->GetDistanceMetric(
           DistanceMetric::RELATED_CONTROL_HORIZONTAL)),
       horizontal_alignment_(gfx::ALIGN_LEFT) {
   SetAnimationDuration(kHoverAnimationDurationMs);