Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

Index: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 08c0622dd98bb0c0ffd09afb7cef7ec98e2826f4..7854f02c78a29c4afbe73a8654500f035f846908 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -7,6 +7,7 @@
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
 #include "chrome/browser/ui/views/ime_driver/ime_driver_mus.h"
 #include "components/constrained_window/constrained_window_views.h"
 
@@ -64,7 +65,10 @@ void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {
   // The delegate needs to be set before any UI is created so that windows
   // display the correct icon.
   if (!views::ViewsDelegate::GetInstance())
-    views_delegate_.reset(new ChromeViewsDelegate);
+    views_delegate_ = base::MakeUnique<ChromeViewsDelegate>();
+
+  if (!views::LayoutDelegate::Get())
+    layout_delegate_ = ChromeLayoutDelegate::CreateLayoutDelegate();
 
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());