Commit 9664c655 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

Modify LoginWebDialogTest.CloseDialogByAccelerator to not depend on ash.

Bug: none
Change-Id: If04229d0caf53848f6dde4f0f7aabde053954f67
Reviewed-on: https://chromium-review.googlesource.com/1008526Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551518}
parent 04d6ce0b
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include "chrome/browser/chromeos/login/ui/login_web_dialog.h" #include "chrome/browser/chromeos/login/ui/login_web_dialog.h"
#include "ash/shell.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
...@@ -38,7 +37,7 @@ IN_PROC_BROWSER_TEST_F(LoginWebDialogTest, CloseDialogByAccelerator) { ...@@ -38,7 +37,7 @@ IN_PROC_BROWSER_TEST_F(LoginWebDialogTest, CloseDialogByAccelerator) {
ASSERT_TRUE(window); ASSERT_TRUE(window);
views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
views::test::WidgetClosingObserver closing_observer(widget); views::test::WidgetClosingObserver closing_observer(widget);
ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow()); ui::test::EventGenerator generator(window);
generator.PressKey(ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN); generator.PressKey(ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN);
closing_observer.Wait(); closing_observer.Wait();
EXPECT_TRUE(closing_observer.widget_closed()); EXPECT_TRUE(closing_observer.widget_closed());
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
-AutomationApiTestWithDeviceScaleFactor.* -AutomationApiTestWithDeviceScaleFactor.*
-AutomationManagerAuraBrowserTest.* -AutomationManagerAuraBrowserTest.*
# Uses Shell::GetPrimaryRootWindow to create an EventGenerator
-LoginWebDialogTest.CloseDialogByAccelerator
# Direct access to ash window frames, tablet mode, overview mode, etc. # Direct access to ash window frames, tablet mode, overview mode, etc.
-BrowserNonClientFrameViewAshBackButtonTest.* -BrowserNonClientFrameViewAshBackButtonTest.*
-BrowserNonClientFrameViewAshTest.* -BrowserNonClientFrameViewAshTest.*
......
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