Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/controls/button/image_button_factory.cc

Index: ui/views/controls/button/image_button_factory.cc
diff --git a/ui/views/controls/button/image_button_factory.cc b/ui/views/controls/button/image_button_factory.cc
index 5905b46bc868206ebdacf7e6cf776a26b28a8606..55b68f36f4b84d8cc3800973c4c0825bc331577b 100644
--- a/ui/views/controls/button/image_button_factory.cc
+++ b/ui/views/controls/button/image_button_factory.cc
@@ -10,8 +10,8 @@
 #include "ui/views/border.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/layout/views_layout_delegate.h"
 #include "ui/views/painter.h"
-#include "ui/views/views_delegate.h"
 
 namespace views {
 
@@ -23,8 +23,8 @@ ImageButton* CreateVectorImageButton(ButtonListener* listener) {
                             ImageButton::ALIGN_MIDDLE);
   button->SetFocusPainter(nullptr);
   button->SetBorder(
-      CreateEmptyBorder(ViewsDelegate::GetInstance()->GetInsetsMetric(
-          InsetsMetric::VECTOR_IMAGE_BUTTON_PADDING)));
+      CreateEmptyBorder(ViewsLayoutDelegate::Get()->GetInsetsMetric(
+          InsetsMetric::VECTOR_IMAGE_BUTTON)));
   return button;
 }