Broke out layout metric information from ViewsDelegate to LayoutProvider

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #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"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ skipping 13 matching lines @@
  public:
   views::View* TestCreateExtraView() {
     DCHECK(bubble_);
     return bubble_->CreateExtraView();
   }
 
  protected:
   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();
   }
 
   std::unique_ptr<views::Widget> CreateAnchorWidget() {
     std::unique_ptr<views::Widget> anchor_widget(new views::Widget());
     views::Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 351 matching lines @@
     } else {
       EXPECT_TRUE(gfx::test::AreImagesEqual(
           gfx::Image(static_cast<const views::ImageView*>(v)->GetImage()),
           gfx::Image(gfx::CreateVectorIcon(ui::kBusinessIcon, kIconSize,
                                            gfx::kChromeIconGrey))));
     }
   }
 
   CloseBubble();
 }