Rename various LayoutDelegate types/functions for brevity and consistency.

chrome/browser/ui/views/cookie_info_view.cc

Index: chrome/browser/ui/views/cookie_info_view.cc
diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc
index 22149ce399844f16cf8a645233552695c981f6d8..cd736fe2e6bd8e69ef00a434f5d8ca9537238dd0 100644
--- a/chrome/browser/ui/views/cookie_info_view.cc
+++ b/chrome/browser/ui/views/cookie_info_view.cc
@@ -147,11 +147,12 @@ void CookieInfoView::Init() {
   expires_value_field_ = new views::Textfield;
 
   views::GridLayout* layout = new views::GridLayout(this);
-  layout->SetInsets(
-      0, LayoutDelegate::Get()->GetLayoutDistance(
-             LayoutDelegate::LayoutDistanceType::DIALOG_BUTTON_MARGIN),
-      0, LayoutDelegate::Get()->GetLayoutDistance(
-             LayoutDelegate::LayoutDistanceType::DIALOG_BUTTON_MARGIN));
+  layout->SetInsets(0,
+                    LayoutDelegate::Get()->GetMetric(
+                        LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN),
+                    0,
+                    LayoutDelegate::Get()->GetMetric(
+                        LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN));
   SetLayoutManager(layout);
 
   int three_column_layout_id = 0;
@@ -159,9 +160,10 @@ void CookieInfoView::Init() {
   column_set->AddColumn(LayoutDelegate::Get()->GetControlLabelGridAlignment(),
                         views::GridLayout::CENTER, 0,
                         views::GridLayout::USE_PREF, 0, 0);
-  column_set->AddPaddingColumn(0, LayoutDelegate::Get()->GetLayoutDistance(
-                                      LayoutDelegate::LayoutDistanceType::
-                                          RELATED_CONTROL_HORIZONTAL_SPACING));
+  column_set->AddPaddingColumn(
+      0,
+      LayoutDelegate::Get()->GetMetric(
+          LayoutDelegate::Metric::RELATED_CONTROL_HORIZONTAL_SPACING));
   column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
                         0, views::GridLayout::USE_PREF, 0, 0);
   column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,