diff options
Diffstat (limited to 'content/browser/web_contents/web_contents_view_aura_browsertest.cc')
-rw-r--r-- | content/browser/web_contents/web_contents_view_aura_browsertest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index 3b4ba77..673db0f 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -27,12 +27,12 @@ #include "content/public/test/test_renderer_host.h" #include "content/public/test/test_utils.h" #include "content/shell/browser/shell.h" +#include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/scoped_animation_duration_scale_mode.h" #include "ui/events/event_processor.h" #include "ui/events/event_utils.h" -#include "ui/events/test/event_generator.h" namespace content { @@ -184,7 +184,7 @@ class WebContentsViewAuraTest : public ContentBrowserTest { aura::Window* content = web_contents->GetContentNativeView(); gfx::Rect bounds = content->GetBoundsInRootWindow(); - ui::test::EventGenerator generator(content->GetRootWindow(), content); + aura::test::EventGenerator generator(content->GetRootWindow(), content); const int kScrollDurationMs = 20; const int kScrollSteps = 10; @@ -448,7 +448,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, MAYBE_OverscrollScreenshot) { content::TitleWatcher title_watcher(web_contents, expected_title); aura::Window* content = web_contents->GetContentNativeView(); gfx::Rect bounds = content->GetBoundsInRootWindow(); - ui::test::EventGenerator generator(content->GetRootWindow(), content); + aura::test::EventGenerator generator(content->GetRootWindow(), content); generator.GestureScrollSequence( gfx::Point(bounds.x() + 2, bounds.y() + 10), gfx::Point(bounds.right() - 10, bounds.y() + 10), @@ -616,7 +616,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, aura::Window* content = web_contents->GetContentNativeView(); gfx::Rect bounds = content->GetBoundsInRootWindow(); - ui::test::EventGenerator generator(content->GetRootWindow(), content); + aura::test::EventGenerator generator(content->GetRootWindow(), content); generator.GestureScrollSequence( gfx::Point(bounds.x() + 2, bounds.y() + 10), gfx::Point(bounds.right() - 10, bounds.y() + 10), @@ -637,7 +637,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, ContentWindowClose) { aura::Window* content = web_contents->GetContentNativeView(); gfx::Rect bounds = content->GetBoundsInRootWindow(); - ui::test::EventGenerator generator(content->GetRootWindow(), content); + aura::test::EventGenerator generator(content->GetRootWindow(), content); generator.GestureScrollSequence( gfx::Point(bounds.x() + 2, bounds.y() + 10), gfx::Point(bounds.right() - 10, bounds.y() + 10), @@ -685,7 +685,7 @@ IN_PROC_BROWSER_TEST_F(WebContentsViewAuraTest, aura::Window* content = web_contents->GetContentNativeView(); gfx::Rect bounds = content->GetBoundsInRootWindow(); - ui::test::EventGenerator generator(content->GetRootWindow(), content); + aura::test::EventGenerator generator(content->GetRootWindow(), content); // Do a swipe left to start a forward navigation. Then quickly do a swipe // right. |