Refactor ViewsDelegate and MD-ify the icon-to-text spacing for checkbox and radiobutton

chrome/browser/ui/views/harmony/layout_delegate.cc

Index: chrome/browser/ui/views/harmony/layout_delegate.cc
diff --git a/chrome/browser/ui/views/harmony/layout_delegate.cc b/chrome/browser/ui/views/harmony/layout_delegate.cc
index 1f80b8776d9492dc62e1618e34ede4c13608d15f..167333803bd82e3b1d7769d1802272588d664587 100644
--- a/chrome/browser/ui/views/harmony/layout_delegate.cc
+++ b/chrome/browser/ui/views/harmony/layout_delegate.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/ui/views/harmony/harmony_layout_delegate.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/views_delegate.h"
 
 static base::LazyInstance<LayoutDelegate> layout_delegate_ =
     LAZY_INSTANCE_INITIALIZER;
@@ -23,23 +24,28 @@ LayoutDelegate* LayoutDelegate::Get() {
 int LayoutDelegate::GetMetric(Metric metric) const {
   switch (metric) {
     case Metric::BUTTON_HORIZONTAL_PADDING:
-      return views::kButtonHorizontalPadding;
+      return views::ViewsDelegate::GetDefaultSpacingMetric(
+          views::SpacingMetric::BUTTON_HORIZONTAL_PADDING);
     case Metric::BUTTON_MINIMUM_WIDTH:
       return views::kMinimumButtonWidth;
     case Metric::DIALOG_BUTTON_MARGIN:
       return views::kButtonHEdgeMarginNew;
     case Metric::DIALOG_BUTTON_MINIMUM_WIDTH:
-      return views::kDialogMinimumButtonWidth;
+      return views::ViewsDelegate::GetDefaultSpacingMetric(
+          views::SpacingMetric::DIALOG_BUTTON_MINIMUM_WIDTH);
     case Metric::DIALOG_BUTTON_TOP_SPACING:
       return 0;
     case Metric::DIALOG_CLOSE_BUTTON_MARGIN:
-      return views::kCloseButtonMargin;
+      return views::ViewsDelegate::GetDefaultSpacingMetric(
+          views::SpacingMetric::CLOSE_BUTTON_MARGIN);
     case Metric::PANEL_CONTENT_MARGIN:
       return views::kPanelHorizMargin;
     case Metric::RELATED_BUTTON_HORIZONTAL_SPACING:
-      return views::kRelatedButtonHSpacing;
+      return views::ViewsDelegate::GetDefaultSpacingMetric(
+          views::SpacingMetric::RELATED_HORIZONTAL_BUTTON);
     case Metric::RELATED_CONTROL_HORIZONTAL_SPACING:
-      return views::kRelatedControlHorizontalSpacing;
+      return views::ViewsDelegate::GetDefaultSpacingMetric(
+          views::SpacingMetric::RELATED_VERTICAL_CONTROL);
     case Metric::RELATED_CONTROL_VERTICAL_SPACING:
       return views::kRelatedControlVerticalSpacing;
     case Metric::RELATED_LABEL_HORIZONTAL_SPACING:
@@ -54,6 +60,9 @@ int LayoutDelegate::GetMetric(Metric metric) const {
       return views::kUnrelatedControlVerticalSpacing;
     case Metric::UNRELATED_CONTROL_VERTICAL_SPACING_LARGE:
       return views::kUnrelatedControlLargeVerticalSpacing;
+    case Metric::ICON_TEXT_SPACING:
+      return views::ViewsDelegate::GetDefaultSpacingMetric(
+          views::SpacingMetric::ICON_TO_TEXT);
   }
   NOTREACHED();
   return 0;