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

ui/views/corewm/tooltip_controller_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/corewm/tooltip_controller.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/screen_type_delegate.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/views/corewm/tooltip_aura.h"
 #include "ui/views/corewm/tooltip_controller_test_helper.h"
 #include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/view.h"
@@ skipping 66 matching lines @@
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
 #endif
     widget_.reset(CreateWidget(root_window()));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
     helper_.reset(new TooltipControllerTestHelper(
                       GetController(widget_.get())));
-    generator_.reset(new aura::test::EventGenerator(GetRootWindow()));
+    generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
   }
 
   virtual void TearDown() OVERRIDE {
 #if defined(OS_CHROMEOS)
     root_window()->RemovePreTargetHandler(controller_.get());
     aura::client::SetTooltipClient(root_window(), NULL);
     controller_.reset();
 #endif
     generator_.reset();
     helper_.reset();
@@ skipping 15 matching lines @@
     TooltipTestView* view2 = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view2);
     view_->SetBounds(0, 0, 100, 100);
     view2->SetBounds(100, 0, 100, 100);
     return view2;
   }
 
   scoped_ptr<views::Widget> widget_;
   TooltipTestView* view_;
   scoped_ptr<TooltipControllerTestHelper> helper_;
-  scoped_ptr<aura::test::EventGenerator> generator_;
+  scoped_ptr<ui::test::EventGenerator> generator_;
 
  private:
   scoped_ptr<TooltipController> controller_;
 
   scoped_ptr<views::TestViewsDelegate> views_delegate_;
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
@@ skipping 442 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     wm_state_.reset(new wm::WMState);
     aura::test::AuraTestBase::SetUp();
     new wm::DefaultActivationClient(root_window());
     controller_.reset(new TooltipController(
                           scoped_ptr<corewm::Tooltip>(test_tooltip_)));
     root_window()->AddPreTargetHandler(controller_.get());
     SetTooltipClient(root_window(), controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
-    generator_.reset(new aura::test::EventGenerator(root_window()));
+    generator_.reset(new ui::test::EventGenerator(root_window()));
   }
 
   virtual void TearDown() OVERRIDE {
     root_window()->RemovePreTargetHandler(controller_.get());
     aura::client::SetTooltipClient(root_window(), NULL);
     controller_.reset();
     generator_.reset();
     helper_.reset();
     aura::test::AuraTestBase::TearDown();
     wm_state_.reset();
   }
 
  protected:
   // Owned by |controller_|.
   TestTooltip* test_tooltip_;
   scoped_ptr<TooltipControllerTestHelper> helper_;
-  scoped_ptr<aura::test::EventGenerator> generator_;
+  scoped_ptr<ui::test::EventGenerator> generator_;
 
  private:
   scoped_ptr<TooltipController> controller_;
   scoped_ptr<wm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest2);
 };
 
 TEST_F(TooltipControllerTest2, VerifyLeadingTrailingWhitespaceStripped) {
   aura::test::TestWindowDelegate test_delegate;
@@ skipping 39 matching lines @@
     wm_state_.reset(new wm::WMState);
     aura::test::AuraTestBase::SetUp();
     new wm::DefaultActivationClient(root_window());
 
     widget_.reset(CreateWidget(root_window()));
     widget_->SetContentsView(new View);
     view_ = new TooltipTestView;
     widget_->GetContentsView()->AddChildView(view_);
     view_->SetBoundsRect(widget_->GetContentsView()->GetLocalBounds());
 
-    generator_.reset(new aura::test::EventGenerator(GetRootWindow()));
+    generator_.reset(new ui::test::EventGenerator(GetRootWindow()));
     controller_.reset(new TooltipController(
         scoped_ptr<views::corewm::Tooltip>(test_tooltip_)));
     GetRootWindow()->RemovePreTargetHandler(
         static_cast<TooltipController*>(aura::client::GetTooltipClient(
             widget_->GetNativeWindow()->GetRootWindow())));
     GetRootWindow()->AddPreTargetHandler(controller_.get());
     helper_.reset(new TooltipControllerTestHelper(controller_.get()));
     SetTooltipClient(GetRootWindow(), controller_.get());
   }
 
   virtual void TearDown() OVERRIDE {
     GetRootWindow()->RemovePreTargetHandler(controller_.get());
     aura::client::SetTooltipClient(GetRootWindow(), NULL);
 
     controller_.reset();
     generator_.reset();
     helper_.reset();
     widget_.reset();
     aura::test::AuraTestBase::TearDown();
     wm_state_.reset();
   }
 
   aura::Window* GetWindow() { return widget_->GetNativeWindow(); }
 
  protected:
   // Owned by |controller_|.
   TestTooltip* test_tooltip_;
   scoped_ptr<TooltipControllerTestHelper> helper_;
-  scoped_ptr<aura::test::EventGenerator> generator_;
+  scoped_ptr<ui::test::EventGenerator> generator_;
   scoped_ptr<views::Widget> widget_;
   TooltipTestView* view_;
 
  private:
   scoped_ptr<TooltipController> controller_;
   scoped_ptr<wm::WMState> wm_state_;
 
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
@@ skipping 104 matching lines @@
   helper_->FireTooltipTimer();
   tooltip_bounds1 = test_tooltip_->location();
 
   EXPECT_NE(tooltip_bounds1_1, tooltip_bounds1);
   EXPECT_EQ(reference_string, helper_->GetTooltipText());
 }
 
 }  // namespace test
 }  // namespace corewm
 }  // namespace views