Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/page_info/page_info_popup_view.cc

Index: chrome/browser/ui/views/page_info/page_info_popup_view.cc
diff --git a/chrome/browser/ui/views/page_info/page_info_popup_view.cc b/chrome/browser/ui/views/page_info/page_info_popup_view.cc
index c1b73ff459d28444d0364d5c46c54b595f4e59cf..1eb7c92ec2e03757b6a0783af9b66682799709dd 100644
--- a/chrome/browser/ui/views/page_info/page_info_popup_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_popup_view.cc
@@ -23,8 +23,8 @@
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/page_info/page_info.h"
 #include "chrome/browser/ui/views/collected_cookies_views.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
 #include "chrome/browser/ui/views/harmony/chrome_typography.h"
-#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/browser/ui/views/page_info/chosen_object_row.h"
 #include "chrome/browser/ui/views/page_info/non_accessible_image_view.h"
 #include "chrome/browser/ui/views/page_info/permission_selector_row.h"
@@ -308,7 +308,7 @@ InternalPageInfoPopupView::InternalPageInfoPopupView(
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, kSpacing,
                                         kSpacing, kSpacing));
   set_margins(gfx::Insets());
-  if (LayoutDelegate::Get()->ShouldShowWindowIcon()) {
+  if (ChromeLayoutDelegate::Get()->ShouldShowWindowIcon()) {
     views::ImageView* icon_view = new NonAccessibleImageView();
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     icon_view->SetImage(rb.GetImageSkiaNamed(icon));
@@ -436,8 +436,8 @@ PageInfoPopupView::PageInfoPopupView(
     // In non-material, titles are inset from the dialog margin. Ensure the
     // horizontal insets match.
     set_title_margins(
-        gfx::Insets(LayoutDelegate::Get()->GetMetric(
-                        LayoutDelegate::Metric::PANEL_CONTENT_MARGIN),
+        gfx::Insets(ChromeLayoutDelegate::Get()->GetDistanceMetric(
+                        ChromeDistanceMetric::PANEL_CONTENT_MARGIN),
                     side_margin, 0, side_margin));
   }
   views::BubbleDialogDelegateView::CreateBubble(this);