Index: chrome/browser/ui/browser_browsertest.cc |
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc |
index 8fbaf0a6646dfc2650bf02e6c028811465f68f48..21ae18ed6f804fd08236e9a598994c59b0118294 100644 |
--- a/chrome/browser/ui/browser_browsertest.cc |
+++ b/chrome/browser/ui/browser_browsertest.cc |
@@ -2562,6 +2562,13 @@ IN_PROC_BROWSER_TEST_F(ClickModifierTest, DISABLED_HrefShiftMiddleClickTest) { |
} |
IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { |
+ // Force an initial resize. This works around a test-only problem on Chrome OS |
+ // where the shelf may not be created before the initial test browser window |
+ // opens, which leads to sizing issues in WebContents resize. |
+ browser()->window()->SetBounds(gfx::Rect(10, 20, 600, 400)); |
+ // Let the message loop run so that resize actually takes effect. |
+ content::RunAllPendingInMessageLoop(); |
+ |
// The instant extended NTP has javascript that does not work with |
// ui_test_utils::NavigateToURL. The NTP rvh reloads when the browser tries |
// to navigate away from the page, which causes the WebContents to end up in |
@@ -2685,6 +2692,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, GetSizeForNewRenderView) { |
#endif |
EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
+ |
gfx::Size exp_final_size(initial_wcv_size); |
exp_final_size.Enlarge(wcv_resize_insets.width(), |
wcv_resize_insets.height() + height_inset); |