Broke out layout metric information from ViewsDelegate to LayoutProvider

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc

Index: chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
index fe7c4ba9ba26ff3323576b7c6ae1f99f6a9f45ac..1b93268b0732a968f2c386f43308fe5ccf04362d 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
+#include "chrome/browser/ui/views/harmony/chrome_views_layout_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -44,6 +45,14 @@ class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase {
   ToolbarActionsBarBubbleViewsTest() {}
   ~ToolbarActionsBarBubbleViewsTest() override {}
 
+  void SetUp() override {
+    views::ViewsTestBase::SetUp();
+    // Clear any existing layout delegate to avoid a safety DCHECK().
+    views_delegate()->set_layout_delegate(nullptr);

[Peter Kasting, 2017/04/04 02:08:55]

Should no longer be necessary.

+    views_delegate()->set_layout_delegate(
+        base::MakeUnique<ChromeViewsLayoutDelegate>());
+  }
+
   void TearDown() override {
     anchor_widget_.reset();
     views::ViewsTestBase::TearDown();