WindowManagerApp should recognize gestures

ui/events/gestures/gesture_provider_impl_unittest.cc

Index: ui/events/gestures/gesture_provider_impl_unittest.cc
diff --git a/ui/events/gestures/gesture_provider_aura_unittest.cc b/ui/events/gestures/gesture_provider_impl_unittest.cc
similarity index 54%
rename from ui/events/gestures/gesture_provider_aura_unittest.cc
rename to ui/events/gestures/gesture_provider_impl_unittest.cc
index 11cc3ca5642f69f3db59bea7d05869f0b7c047f8..66cc80884860101791d4246773078b4e02961ea9 100644
--- a/ui/events/gestures/gesture_provider_aura_unittest.cc
+++ b/ui/events/gestures/gesture_provider_impl_unittest.cc
@@ -6,33 +6,33 @@
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
-#include "ui/events/gestures/gesture_provider_aura.h"
+#include "ui/events/gestures/gesture_provider_impl.h"
 
 namespace ui {
 
-class GestureProviderAuraTest : public testing::Test,
-                                public GestureProviderAuraClient {
+class GestureProviderImplTest : public testing::Test,
+                                public GestureProviderImplClient {
  public:
-  GestureProviderAuraTest() {}
+  GestureProviderImplTest() {}
 
-  virtual ~GestureProviderAuraTest() {}
+  virtual ~GestureProviderImplTest() {}
 
   virtual void OnGestureEvent(GestureEvent* event) override {}
 
   virtual void SetUp() override {
-    provider_.reset(new GestureProviderAura(this));
+    provider_.reset(new GestureProviderImpl(this));
   }
 
   virtual void TearDown() override { provider_.reset(); }
 
-  GestureProviderAura* provider() { return provider_.get(); }
+  GestureProviderImpl* provider() { return provider_.get(); }
 
  private:
-  scoped_ptr<GestureProviderAura> provider_;
+  scoped_ptr<GestureProviderImpl> provider_;
   base::MessageLoopForUI message_loop_;
 };
 
-TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) {
+TEST_F(GestureProviderImplTest, IgnoresExtraPressEvents) {
   base::TimeDelta time = ui::EventTimeForNow();
   TouchEvent press1(ET_TOUCH_PRESSED, gfx::PointF(10, 10), 0, time);
   EXPECT_TRUE(provider()->OnTouchEvent(press1));
@@ -43,7 +43,7 @@ TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) {
   EXPECT_FALSE(provider()->OnTouchEvent(press2));
 }
 
-TEST_F(GestureProviderAuraTest, IgnoresExtraMoveOrReleaseEvents) {
+TEST_F(GestureProviderImplTest, IgnoresExtraMoveOrReleaseEvents) {
   base::TimeDelta time = ui::EventTimeForNow();
   TouchEvent press1(ET_TOUCH_PRESSED, gfx::PointF(10, 10), 0, time);
   EXPECT_TRUE(provider()->OnTouchEvent(press1));
@@ -61,7 +61,7 @@ TEST_F(GestureProviderAuraTest, IgnoresExtraMoveOrReleaseEvents) {
   EXPECT_FALSE(provider()->OnTouchEvent(move1));
 }
 
-TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
+TEST_F(GestureProviderImplTest, IgnoresIdenticalMoveEvents) {
   const float kRadiusX = 20.f;
   const float kRadiusY = 30.f;
   const float kAngle = 0.321f;
@@ -77,76 +77,34 @@ TEST_F(GestureProviderAuraTest, IgnoresIdenticalMoveEvents) {
   EXPECT_TRUE(provider()->OnTouchEvent(press1_1));
 
   time += base::TimeDelta::FromMilliseconds(10);
-  TouchEvent move0_1(ET_TOUCH_MOVED,
-                   gfx::PointF(10, 10),
-                   0,
-                   kTouchId0,
-                   time,
-                   kRadiusX,
-                   kRadiusY,
-                   kAngle,
-                   kForce);
+  TouchEvent move0_1(ET_TOUCH_MOVED, gfx::PointF(10, 10), 0, kTouchId0, time,
+                     kRadiusX, kRadiusY, kAngle, kForce);
   EXPECT_TRUE(provider()->OnTouchEvent(move0_1));
 
-  TouchEvent move1_1(ET_TOUCH_MOVED,
-                   gfx::PointF(100, 200),
-                   0,
-                   kTouchId1,
-                   time,
-                   kRadiusX,
-                   kRadiusY,
-                   kAngle,
-                   kForce);
+  TouchEvent move1_1(ET_TOUCH_MOVED, gfx::PointF(100, 200), 0, kTouchId1, time,
+                     kRadiusX, kRadiusY, kAngle, kForce);
   EXPECT_TRUE(provider()->OnTouchEvent(move1_1));
 
   time += base::TimeDelta::FromMilliseconds(10);
-  TouchEvent move0_2(ET_TOUCH_MOVED,
-                     gfx::PointF(10, 10),
-                     0,
-                     kTouchId0,
-                     time,
-                     kRadiusX,
-                     kRadiusY,
-                     kAngle,
-                     kForce);
+  TouchEvent move0_2(ET_TOUCH_MOVED, gfx::PointF(10, 10), 0, kTouchId0, time,
+                     kRadiusX, kRadiusY, kAngle, kForce);
   // Nothing has changed, so ignore the move.
   EXPECT_FALSE(provider()->OnTouchEvent(move0_2));
 
-  TouchEvent move1_2(ET_TOUCH_MOVED,
-                     gfx::PointF(100, 200),
-                     0,
-                     kTouchId1,
-                     time,
-                     kRadiusX,
-                     kRadiusY,
-                     kAngle,
-                     kForce);
+  TouchEvent move1_2(ET_TOUCH_MOVED, gfx::PointF(100, 200), 0, kTouchId1, time,
+                     kRadiusX, kRadiusY, kAngle, kForce);
   // Nothing has changed, so ignore the move.
   EXPECT_FALSE(provider()->OnTouchEvent(move1_2));
 
   time += base::TimeDelta::FromMilliseconds(10);
-  TouchEvent move0_3(ET_TOUCH_MOVED,
-                     gfx::PointF(70, 75.1f),
-                     0,
-                     kTouchId0,
-                     time,
-                     kRadiusX,
-                     kRadiusY,
-                     kAngle,
-                     kForce);
+  TouchEvent move0_3(ET_TOUCH_MOVED, gfx::PointF(70, 75.1f), 0, kTouchId0, time,
+                     kRadiusX, kRadiusY, kAngle, kForce);
   // Position has changed, so don't ignore the move.
   EXPECT_TRUE(provider()->OnTouchEvent(move0_3));
 
   time += base::TimeDelta::FromMilliseconds(10);
-  TouchEvent move0_4(ET_TOUCH_MOVED,
-                     gfx::PointF(70, 75.1f),
-                     0,
-                     kTouchId0,
-                     time,
-                     kRadiusX,
-                     kRadiusY + 1,
-                     kAngle,
-                     kForce);
+  TouchEvent move0_4(ET_TOUCH_MOVED, gfx::PointF(70, 75.1f), 0, kTouchId0, time,
+                     kRadiusX, kRadiusY + 1, kAngle, kForce);
 }
 
 }  // namespace ui