Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/style/typography.cc

Index: ui/views/style/typography.cc
diff --git a/ui/views/style/typography.cc b/ui/views/style/typography.cc
index 404c76e1761aeeb053be35ba6ee0674a63575342..b54146a4242f88c9a4662c278b602839f43d0fb6 100644
--- a/ui/views/style/typography.cc
+++ b/ui/views/style/typography.cc
@@ -5,8 +5,8 @@
 #include "ui/views/style/typography.h"
 
 #include "base/logging.h"
+#include "ui/views/layout/views_layout_delegate.h"
 #include "ui/views/style/typography_provider.h"
-#include "ui/views/views_delegate.h"
 
 namespace views {
 namespace style {
@@ -22,19 +22,19 @@ void ValidateContextAndStyle(int text_context, int text_style) {
 
 const gfx::FontList& GetFont(int text_context, int text_style) {
   ValidateContextAndStyle(text_context, text_style);
-  return ViewsDelegate::GetInstance()->GetTypographyProvider().GetFont(
+  return ViewsLayoutDelegate::Get()->GetTypographyProvider().GetFont(
       text_context, text_style);
 }
 
 SkColor GetColor(int text_context, int text_style) {
   ValidateContextAndStyle(text_context, text_style);
-  return ViewsDelegate::GetInstance()->GetTypographyProvider().GetColor(
+  return ViewsLayoutDelegate::Get()->GetTypographyProvider().GetColor(
       text_context, text_style);
 }
 
 int GetLineHeight(int text_context, int text_style) {
   ValidateContextAndStyle(text_context, text_style);
-  return ViewsDelegate::GetInstance()->GetTypographyProvider().GetLineHeight(
+  return ViewsLayoutDelegate::Get()->GetTypographyProvider().GetLineHeight(
       text_context, text_style);
 }