Commit 302009c7 authored by Bret Sepulveda's avatar Bret Sepulveda Committed by Commit Bot

Fix tests programmatically setting the window size under Refresh.

There were several tests that were failing because they were attempting
to set the window to a particular size, and the minimum size of a window
increases to more than that size when Refresh is enabled.

TBR=gab@chromium.org

Bug: 846410, 853057, 853044
Change-Id: Idad9ae2db2d0eacfc0432d9b5bb0ebe6734d47a4
Reviewed-on: https://chromium-review.googlesource.com/1111106
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569857}
parent f50c6b15
......@@ -55,13 +55,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
#endif // defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
MAYBE_UpdateWindowSizeExitsFullscreen) {
#if defined(OS_LINUX)
// TODO(crbug.com/853057): Test fails on Refresh because
// "window_update/sizing" fails for unknown reasons. Needs investigation.
if (ui::MaterialDesignController::IsRefreshUi())
return;
#endif
browser()->exclusive_access_manager()->context()->EnterFullscreen(
GURL(), EXCLUSIVE_ACCESS_BUBBLE_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
ASSERT_TRUE(RunExtensionTest("window_update/sizing")) << message_;
......
......@@ -28,7 +28,7 @@
typedef InProcessBrowserTest PreservedWindowPlacement;
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) {
browser()->window()->SetBounds(gfx::Rect(20, 30, 400, 500));
browser()->window()->SetBounds(gfx::Rect(20, 30, 500, 600));
}
// Fails on Chrome OS as the browser thinks it is restarting after a crash, see
......@@ -39,14 +39,8 @@ IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, PRE_Test) {
#define MAYBE_Test Test
#endif
IN_PROC_BROWSER_TEST_F(PreservedWindowPlacement, MAYBE_Test) {
#if defined(OS_LINUX)
// TODO(crbug.com/853044): Test fails on Refresh because the window is too
// tall. Needs investigation.
if (ui::MaterialDesignController::IsRefreshUi())
return;
#endif
gfx::Rect bounds = browser()->window()->GetBounds();
gfx::Rect expected_bounds(gfx::Rect(20, 30, 400, 500));
gfx::Rect expected_bounds(gfx::Rect(20, 30, 500, 600));
ASSERT_EQ(expected_bounds.ToString(), bounds.ToString());
}
......
......@@ -6,8 +6,8 @@ var pass = chrome.test.callbackPass;
var finalTop = 400;
var finalLeft = 10;
var finalWidth = 480;
var finalHeight = 301;
var finalWidth = 580;
var finalHeight = 401;
var chromeWindow = null;
......
{
"browser" : {
"window_placement" : {
"bottom" : 400,
"bottom" : 600,
"left" : 50,
"maximized" : false,
"right" : 450,
"right" : 650,
"top" : 50
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment