Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
index 71208cbfc2501deb599f2a50a5ce703e6e5ff9de..c74659b9870c90370f10ad8b3ecd94c9ae0cfeae 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
@@ -3,12 +3,16 @@
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_base.h"
+#include "ash/test/ash_test_helper.h"
+#include "ash/test/ash_test_views_delegate.h"
 #include "base/macros.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_delegate.h"
 #include "chrome/test/base/testing_profile.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/test/test_views_delegate.h"

[Peter Kasting, 2017/04/06 08:13:36]

Nit: This #include seems unnecessary?

[kylix_rd, 2017/04/06 16:48:19]

It seems you're right. Done.

 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
@@ -26,6 +30,8 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
   // Overridden from testing::Test:
   void SetUp() override {
     ash::test::AshTestBase::SetUp();
+    ash_test_helper()->test_views_delegate()->set_layout_delegate(
+        base::MakeUnique<ChromeLayoutDelegate>());
     widget_ = views::DialogDelegate::CreateDialogWidget(
         new views::DialogDelegateView(), CurrentContext(), NULL);
     dialog_ = new AppInfoDialog(