MacViews: Add WidgetEventGenerator to abstract platform-specific event generation for tests.

ui/views/controls/slider_unittest.cc

 // Copyright (c) 2012 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/controls/slider.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/event.h"
 #include "ui/events/gesture_event_details.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/test/slider_test_api.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 // A views::SliderListener that tracks simple event call history.
 class TestSliderListener : public views::SliderListener {
@@ skipping 111 matching lines @@
   int max_y() {
     return max_y_;
   }
 
   virtual void ClickAt(int x, int y);
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
-  aura::test::EventGenerator* event_generator() {
+  ui::test::EventGenerator* event_generator() {
     return event_generator_.get();
   }
 
  private:
   // The Slider's orientation
   Slider::Orientation orientation_;
   // The Slider to be tested.
   Slider* slider_;
   // A simple SliderListener test double.
   TestSliderListener slider_listener_;
   // Stores the default locale at test setup so it can be restored
   // during test teardown.
   std::string default_locale_;
   // The maximum x value within the bounds of the slider.
   int max_x_;
   // The maximum y value within the bounds of the slider.
   int max_y_;
   // The widget container for the slider being tested.
   views::Widget* widget_;
   // An event generator.
-  scoped_ptr<aura::test::EventGenerator> event_generator_;
+  scoped_ptr<ui::test::EventGenerator> event_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(SliderTest);
 };
 
 SliderTest::SliderTest(Slider::Orientation orientation)
   : orientation_(orientation),
     slider_(NULL),
     default_locale_(""),
     max_x_(0),
     max_y_(0) {
@@ skipping 15 matching lines @@
 
   views::Widget::InitParams init_params(CreateParams(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS));
   init_params.bounds = gfx::Rect(size);
 
   widget_ = new views::Widget();
   widget_->Init(init_params);
   widget_->SetContentsView(slider_);
   widget_->Show();
 
-  aura::Window* native_window = widget_->GetNativeWindow();
-  event_generator_.reset(new aura::test::EventGenerator(
-        native_window->GetRootWindow()));
+  event_generator_.reset(new ui::test::EventGenerator(
+      GetContext(), widget_->GetNativeWindow()));
 }
 
 void SliderTest::TearDown() {
   if (widget_ && !widget_->IsClosed())
     widget_->Close();
 
   base::i18n::SetICUDefaultLocale(default_locale_);
 
   views::ViewsTestBase::TearDown();
 }
@@ skipping 155 matching lines @@
       2 /* move_x */, 0 /* move_y */);
 
   EXPECT_EQ(1, slider_listener().last_drag_started_epoch());
   EXPECT_GT(slider_listener().last_drag_ended_epoch(),
             slider_listener().last_drag_started_epoch());
   EXPECT_EQ(slider(), slider_listener().last_drag_started_sender());
   EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender());
 }
 
 }  // namespace views