Remove remaining Layout() calls in tests in c/b/ui/view/frame/

Bug: 1350521
Change-Id: Ic74aa13cb48ab5041dbc60f3444a8d0e1074047f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3829749
Commit-Queue: Elaine Chien <[email protected]>
Reviewed-by: Peter Kasting <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1035069}

Author: Elaine Chien

chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native_unittest.cc

@@ -250,7 +250,7 @@ TEST_F(BrowserFrameViewLayoutLinuxNativeTest, NativeNavButtons) {
   layout_manager_->SetButtonOrdering(leading_buttons, trailing_buttons);
   ResetNativeNavButtonImagesFromButtonProvider();
 
-  root_view_->Layout();
+  RunScheduledLayout(root_view_);
 
   const int frame_top_thickness = FrameInsets().top();
 

chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc

@@ -963,7 +963,7 @@ IN_PROC_BROWSER_TEST_P(WebAppNonClientFrameViewAshTest,
 
   // In order to receive focus, the geo icon must be laid out (and be both
   // visible and nonzero size).
-  web_app_frame_toolbar_->Layout();
+  RunScheduledLayouts();
 
   EXPECT_FALSE(web_app_menu_button_->HasFocus());
   EXPECT_FALSE(geolocation_icon->HasFocus());

chrome/browser/ui/views/frame/browser_view_layout_unittest.cc

@@ -160,9 +160,9 @@ class BrowserViewLayoutTest : public ChromeViewsTestBase {
 
   ~BrowserViewLayoutTest() override {}
 
-  BrowserViewLayout* layout() { return layout_.get(); }
+  BrowserViewLayout* layout() { return layout_; }
   MockBrowserViewLayoutDelegate* delegate() { return delegate_; }
-  views::View* root_view() { return root_view_.get(); }
+  views::View* browser_view() { return browser_view_.get(); }
   views::View* top_container() { return top_container_; }
   TabStrip* tab_strip() { return tab_strip_; }
   views::View* webui_tab_strip() { return webui_tab_strip_; }
@@ -174,13 +174,13 @@ class BrowserViewLayoutTest : public ChromeViewsTestBase {
   void SetUp() override {
     ChromeViewsTestBase::SetUp();
 
-    root_view_ = CreateFixedSizeView(gfx::Size(800, 600));
+    browser_view_ = CreateFixedSizeView(gfx::Size(800, 600));
 
     immersive_mode_controller_ =
         std::make_unique<MockImmersiveModeController>();
 
     top_container_ =
-        root_view_->AddChildView(CreateFixedSizeView(gfx::Size(800, 60)));
+        browser_view_->AddChildView(CreateFixedSizeView(gfx::Size(800, 60)));
     auto tab_strip = std::make_unique<TabStrip>(
         std::make_unique<FakeBaseTabStripController>());
     tab_strip_ = tab_strip.get();
@@ -194,11 +194,11 @@ class BrowserViewLayoutTest : public ChromeViewsTestBase {
     separator_ =
         top_container_->AddChildView(std::make_unique<views::Separator>());
 
-    infobar_container_ = root_view_->AddChildView(
+    infobar_container_ = browser_view_->AddChildView(
         std::make_unique<InfoBarContainerView>(nullptr));
 
     contents_container_ =
-        root_view_->AddChildView(CreateFixedSizeView(gfx::Size(800, 600)));
+        browser_view_->AddChildView(CreateFixedSizeView(gfx::Size(800, 600)));
     devtools_web_view_ = contents_container_->AddChildView(
         CreateFixedSizeView(gfx::Size(800, 600)));
     devtools_web_view_->SetVisible(false);
@@ -208,10 +208,9 @@ class BrowserViewLayoutTest : public ChromeViewsTestBase {
         std::make_unique<ContentsLayoutManager>(devtools_web_view_,
                                                 contents_web_view_));
 
-    // TODO(jamescook): Attach |layout_| to |root_view_|?
     auto delegate = std::make_unique<MockBrowserViewLayoutDelegate>();
     delegate_ = delegate.get();
-    layout_ = std::make_unique<BrowserViewLayout>(
+    auto layout = std::make_unique<BrowserViewLayout>(
         std::move(delegate),
         /*host_view=*/nullptr,
         /*browser_view=*/nullptr, top_container_, tab_strip_region_view,
@@ -222,15 +221,17 @@ class BrowserViewLayoutTest : public ChromeViewsTestBase {
         /*right_aligned_side_panel_separator=*/nullptr,
         /*lens_side_panel=*/nullptr, immersive_mode_controller_.get(),
         separator_);
-    layout_->set_webui_tab_strip(webui_tab_strip());
+    layout->set_webui_tab_strip(webui_tab_strip());
+    layout_ = layout.get();
+    browser_view_->SetLayoutManager(std::move(layout));
   }
 
  private:
-  std::unique_ptr<BrowserViewLayout> layout_;
+  BrowserViewLayout* layout_;
   raw_ptr<MockBrowserViewLayoutDelegate> delegate_;  // Owned by |layout_|.
-  std::unique_ptr<views::View> root_view_;
+  std::unique_ptr<views::View> browser_view_;
 
-  // Views owned by |root_view_|.
+  // Views owned by |browser_view_|.
   raw_ptr<views::View> top_container_;
   raw_ptr<TabStrip> tab_strip_;
   raw_ptr<views::View> webui_tab_strip_;
@@ -256,7 +257,7 @@ TEST_F(BrowserViewLayoutTest, Layout) {
   delegate()->set_tab_strip_visible(false);
   delegate()->set_toolbar_visible(false);
   delegate()->set_bookmark_bar_visible(false);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
 
   // Top views are zero-height.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), tab_strip()->bounds());
@@ -267,7 +268,7 @@ TEST_F(BrowserViewLayoutTest, Layout) {
 
   // Turn on the toolbar, like in a pop-up window.
   delegate()->set_toolbar_visible(true);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
 
   // Now the toolbar has bounds and other views shift down.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), tab_strip()->bounds());
@@ -279,7 +280,7 @@ TEST_F(BrowserViewLayoutTest, Layout) {
 
   // Disable the contents separator.
   delegate()->set_content_separator_enabled(false);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
 
   // Now the separator is not visible and the content grows vertically.
   EXPECT_EQ(gfx::Rect(0, 0, 0, 0), tab_strip()->bounds());
@@ -315,7 +316,7 @@ TEST_F(BrowserViewLayoutTest, LayoutContentsWithTopControlsSlideBehavior) {
   delegate()->set_toolbar_visible(true);
   delegate()->set_top_controls_slide_enabled(true);
   delegate()->set_top_controls_shown_ratio(1.f);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
   EXPECT_EQ(gfx::Rect(0, 0, 800, 30), top_container()->bounds());
   EXPECT_EQ(gfx::Rect(0, 0, 800, kToolbarHeight), toolbar()->bounds());
   EXPECT_EQ(gfx::Rect(0, kToolbarHeight, 800, views::Separator::kThickness),
@@ -324,7 +325,7 @@ TEST_F(BrowserViewLayoutTest, LayoutContentsWithTopControlsSlideBehavior) {
 
   // Top controls are half shown, half hidden.
   delegate()->set_top_controls_shown_ratio(0.5f);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
   EXPECT_EQ(gfx::Rect(0, 0, 800, 30), top_container()->bounds());
   EXPECT_EQ(gfx::Rect(0, 0, 800, kToolbarHeight), toolbar()->bounds());
   EXPECT_EQ(gfx::Rect(0, kToolbarHeight, 800, views::Separator::kThickness),
@@ -334,7 +335,7 @@ TEST_F(BrowserViewLayoutTest, LayoutContentsWithTopControlsSlideBehavior) {
   // Top controls are fully hidden. the contents are expanded in height by an
   // amount equal to the top controls height.
   delegate()->set_top_controls_shown_ratio(0.f);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
   EXPECT_EQ(gfx::Rect(0, -30, 800, 30), top_container()->bounds());
   EXPECT_EQ(gfx::Rect(0, 0, 800, kToolbarHeight), toolbar()->bounds());
   EXPECT_EQ(gfx::Rect(0, kToolbarHeight, 800, views::Separator::kThickness),
@@ -346,12 +347,12 @@ TEST_F(BrowserViewLayoutTest, WebUITabStripPushesDownContents) {
   delegate()->set_tab_strip_visible(false);
   delegate()->set_toolbar_visible(true);
   webui_tab_strip()->SetVisible(false);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
   const gfx::Rect original_contents_bounds = contents_container()->bounds();
   EXPECT_EQ(gfx::Size(), webui_tab_strip()->size());
 
   webui_tab_strip()->SetVisible(true);
-  layout()->Layout(root_view());
+  RunScheduledLayout(browser_view());
   EXPECT_LT(0, webui_tab_strip()->size().height());
   EXPECT_EQ(original_contents_bounds.size(), contents_container()->size());
   EXPECT_EQ(webui_tab_strip()->size().height(),

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

@@ -370,7 +370,7 @@ class OpaqueBrowserFrameViewLayoutTest
 TEST_P(OpaqueBrowserFrameViewLayoutTest, BasicWindow) {
   // Tests the layout of a default chrome window with a tabstrip and no window
   // title.
-  root_view_->Layout();
+  RunScheduledLayout(root_view_);
   ExpectCaptionButtons(false, 0);
   ExpectTabStripAndMinimumSize(false);
   ExpectWindowIcon(false);
@@ -385,7 +385,7 @@ TEST_P(OpaqueBrowserFrameViewLayoutTest, WindowButtonsOnLeft) {
   leading_buttons.push_back(views::FrameButton::kMaximize);
   layout_manager_->SetButtonOrdering(leading_buttons, trailing_buttons);
 
-  root_view_->Layout();
+  RunScheduledLayout(root_view_);
   ExpectCaptionButtons(true, 0);
   ExpectTabStripAndMinimumSize(true);
   ExpectWindowIcon(true);
@@ -396,7 +396,7 @@ TEST_P(OpaqueBrowserFrameViewLayoutTest, WithoutCaptionButtons) {
   // should force the tab strip to be condensed).
   delegate_->set_show_caption_buttons(false);
 
-  root_view_->Layout();
+  RunScheduledLayout(root_view_);
   ExpectCaptionButtons(false, 0);
   ExpectTabStripAndMinimumSize(false);
   ExpectWindowIcon(false);
@@ -407,7 +407,7 @@ TEST_P(OpaqueBrowserFrameViewLayoutTest, WindowWithTitleAndIcon) {
   delegate_->set_window_title(u"Window Title");
   AddWindowTitleIcons();
 
-  root_view_->Layout();
+  RunScheduledLayout(root_view_);
   ExpectCaptionButtons(false, 0);
   ExpectWindowIcon(false);
   ExpectWindowTitle();

chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc

@@ -98,7 +98,7 @@ class LayoutTestView : public views::View {
   explicit LayoutTestView(BrowserView* parent) {
     DCHECK(parent);
     parent->AddChildView(this);
-    parent->Layout();
+    parent->GetWidget()->LayoutRootViewIfNecessary();
     layout_count_ = 0;
   }
   ~LayoutTestView() override = default;