Cleanups for aura/test/event_generator.h (resolve TODOs)

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace {
 
 // Class which allows for the designation of non-client component targets of
 // hit tests.
@@ skipping 258 matching lines @@
   native_widget->set_window_component(HTCAPTION);
 
   aura::Window* window = widget->GetNativeWindow();
   window->SetProperty(aura::client::kCanMaximizeKey, true);
 
   // Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
   DesktopWindowTreeHost* rwh =
       DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
           GetAcceleratedWidget());
 
-  aura::test::EventGenerator generator(window);
+  ui::test::EventGenerator generator(window);
   generator.ClickLeftButton();
   generator.DoubleClickLeftButton();
   RunPendingMessages();
   EXPECT_TRUE(rwh->IsMaximized());
 
   widget->CloseNow();
 }
 
 // Tests that the window does not maximize in response to a double click event,
 // if the first click was to a different target component than that of the
 // second click.
 TEST_F(DesktopScreenX11Test, DoubleClickTwoDifferentTargetsDoesntMaximizes) {
   Widget* widget = BuildTopLevelDesktopWidget(gfx::Rect(0, 0, 100, 100), true);
   widget->Show();
   TestDesktopNativeWidgetAura* native_widget =
       static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
 
   aura::Window* window = widget->GetNativeWindow();
   window->SetProperty(aura::client::kCanMaximizeKey, true);
 
   // Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
   DesktopWindowTreeHost* rwh =
       DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
           GetAcceleratedWidget());
 
-  aura::test::EventGenerator generator(window);
+  ui::test::EventGenerator generator(window);
   native_widget->set_window_component(HTCLIENT);
   generator.ClickLeftButton();
   native_widget->set_window_component(HTCAPTION);
   generator.DoubleClickLeftButton();
   RunPendingMessages();
   EXPECT_FALSE(rwh->IsMaximized());
 
   widget->CloseNow();
 }
 
 // Tests that the window does not maximize in response to a double click event,
 // if the double click was interrupted by a right click.
 TEST_F(DesktopScreenX11Test, RightClickDuringDoubleClickDoesntMaximize) {
   Widget* widget = BuildTopLevelDesktopWidget(gfx::Rect(0, 0, 100, 100), true);
   widget->Show();
   TestDesktopNativeWidgetAura* native_widget =
       static_cast<TestDesktopNativeWidgetAura*>(widget->native_widget());
 
   aura::Window* window = widget->GetNativeWindow();
   window->SetProperty(aura::client::kCanMaximizeKey, true);
 
   // Cast to superclass as DesktopWindowTreeHostX11 hide IsMaximized
   DesktopWindowTreeHost* rwh = static_cast<DesktopWindowTreeHost*>(
       DesktopWindowTreeHostX11::GetHostForXID(window->GetHost()->
           GetAcceleratedWidget()));
 
-  aura::test::EventGenerator generator(window);
+  ui::test::EventGenerator generator(window);
   native_widget->set_window_component(HTCLIENT);
   generator.ClickLeftButton();
   native_widget->set_window_component(HTCAPTION);
   generator.PressRightButton();
   generator.ReleaseRightButton();
   EXPECT_FALSE(rwh->IsMaximized());
   generator.DoubleClickLeftButton();
   RunPendingMessages();
   EXPECT_FALSE(rwh->IsMaximized());
 
@@ skipping 87 matching lines @@
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_device_scale_factor(1.f);
   displays[1].set_device_scale_factor(1.f);
   NotifyDisplaysChanged(displays);
   EXPECT_EQ(4u, changed_display_.size());
 }
 
 }  // namespace views