Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/test/base/browser_with_test_window_test.cc

Index: chrome/test/base/browser_with_test_window_test.cc
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index 08a9dd7ab2e11003e9966c62b718e8181912b179..bb73e3819bd7e73b9c38bb97e1a45f41d115f0d9 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -23,17 +23,21 @@
 #include "content/public/test/browser_side_navigation_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "ui/base/page_transition_types.h"
+#include "ui/views/test/test_views_delegate.h"
+
+#if defined(TOOLKIT_VIEWS)
+#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
+#include "components/constrained_window/constrained_window_views.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/test/ash_test_helper.h"
+#include "ash/test/ash_test_views_delegate.h"
 #include "chrome/test/base/ash_test_environment_chrome.h"
-#elif defined(TOOLKIT_VIEWS)
+#else
 #include "ui/views/test/scoped_views_test_helper.h"
+#include "ui/views/test/test_views_delegate.h"
 #endif
-
-#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
-#include "components/constrained_window/constrained_window_views.h"
 #endif
 
 using content::NavigationController;
@@ -66,6 +70,9 @@ void BrowserWithTestWindowTest::SetUp() {
 #endif
 #if defined(TOOLKIT_VIEWS)
   SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
+
+  test_views_delegate()->set_layout_delegate(
+      base::MakeUnique<ChromeLayoutDelegate>());
 #endif
 
   if (content::IsBrowserSideNavigationEnabled())
@@ -208,3 +215,13 @@ Browser* BrowserWithTestWindowTest::CreateBrowser(
   params.window = browser_window;
   return new Browser(params);
 }
+
+#if defined(TOOLKIT_VIEWS)
+views::TestViewsDelegate* BrowserWithTestWindowTest::test_views_delegate() {
+#if defined(OS_CHROMEOS)
+  return ash_test_helper_->test_views_delegate();
+#else
+  return views_test_helper_->test_views_delegate();
+#endif
+}
+#endif