From 18fda9885e28ef5853d0ec0e8a93ff53948e0249 Mon Sep 17 00:00:00 2001 From: oshima Date: Mon, 5 Oct 2015 11:21:57 -0700 Subject: [PATCH] Make sure the ash's host window is placed within the Xvfb's root window so that mouse can move correctly. Enlarge the Xvfb's size to 1280x800 as there are several tests that require minimum width 1280. BUG=538799 R=sky@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1389503002 Cr-Commit-Position: refs/heads/master@{#352357} --- chrome/test/base/view_event_test_platform_part_chromeos.cc | 4 ++++ testing/xvfb.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chrome/test/base/view_event_test_platform_part_chromeos.cc b/chrome/test/base/view_event_test_platform_part_chromeos.cc index 37f48fb5d30cfc..16a678ef7be700 100644 --- a/chrome/test/base/view_event_test_platform_part_chromeos.cc +++ b/chrome/test/base/view_event_test_platform_part_chromeos.cc @@ -4,11 +4,13 @@ #include "chrome/test/base/view_event_test_platform_part.h" +#include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/shell_init_params.h" #include "ash/test/ash_test_helper.h" #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" +#include "base/command_line.h" #include "chromeos/audio/cras_audio_handler.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/network/network_handler.h" @@ -59,6 +61,8 @@ ViewEventTestPlatformPartChromeOS::ViewEventTestPlatformPartChromeOS( init_params.delegate = shell_delegate; init_params.context_factory = context_factory; init_params.blocking_pool = content::BrowserThread::GetBlockingPool(); + base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( + ash::switches::kAshHostWindowBounds, "0+0-1280x800"); ash::Shell::CreateInstance(init_params); ash::test::AshTestHelper::GetTestSessionStateDelegate()-> SetActiveUserSessionStarted(true); diff --git a/testing/xvfb.py b/testing/xvfb.py index 62815b2e789181..2b17d965d32ba5 100755 --- a/testing/xvfb.py +++ b/testing/xvfb.py @@ -83,7 +83,7 @@ def start_xvfb(env, build_dir, xvfb_path='Xvfb', display=':9'): openbox_proc = None try: - xvfb_cmd = [xvfb_path, display, '-screen', '0', '1024x768x24', '-ac', + xvfb_cmd = [xvfb_path, display, '-screen', '0', '1280x800x24', '-ac', '-nolisten', 'tcp', '-dpi', '96'] xvfb_proc = subprocess.Popen(xvfb_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)