Replace old with new synthetic gesture framework.

content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc

 // Copyright 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 "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "content/browser/renderer_host/input/synthetic_gesture_controller_new.h"
-#include "content/browser/renderer_host/input/synthetic_gesture_new.h"
+#include "content/browser/renderer_host/input/synthetic_gesture.h"
+#include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
-#include "content/browser/renderer_host/input/synthetic_pinch_gesture_new.h"
-#include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_new.h"
+#include "content/browser/renderer_host/input/synthetic_pinch_gesture.h"
+#include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/common/input/input_event.h"
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/gfx/point_f.h"
 
 namespace content {
 
 namespace {
 
 const int kFlushInputRateInMs = 16;
 
-class MockSyntheticGesture : public SyntheticGestureNew {
+class MockSyntheticGesture : public SyntheticGesture {
  public:
-  MockSyntheticGesture(bool* finished, int num_steps)
+  MockSyntheticGesture(bool *finished, int num_steps)

[piman, 2013/11/19 20:45:18]

nit: star on the left (as it was)

[Dominik Grewe, 2013/11/20 10:16:32]

Done.

       : finished_(finished),
         num_steps_(num_steps),
         step_count_(0) {
     *finished_ = false;
   }
   virtual ~MockSyntheticGesture() {}
 
   virtual Result ForwardInputEvents(const base::TimeDelta& interval,
                                     SyntheticGestureTarget* target) OVERRIDE {
     step_count_++;
     if (step_count_ == num_steps_) {
       *finished_ = true;
-      return SyntheticGestureNew::GESTURE_FINISHED;
+      return SyntheticGesture::GESTURE_FINISHED;
     } else if (step_count_ > num_steps_) {
       *finished_ = true;
       // Return arbitrary failure.
-      return SyntheticGestureNew::GESTURE_SOURCE_TYPE_NOT_IMPLEMENTED;
-    } else {
-      return SyntheticGestureNew::GESTURE_RUNNING;
+      return SyntheticGesture::GESTURE_SOURCE_TYPE_NOT_IMPLEMENTED;
     }
+
+    return SyntheticGesture::GESTURE_RUNNING;
   }
 
  protected:
   bool* finished_;
   int num_steps_;
   int step_count_;
 };
 
 class MockSyntheticGestureTarget : public SyntheticGestureTarget {
  public:
   MockSyntheticGestureTarget()
       : num_success_(0),
         num_failure_(0),
         flush_requested_(false) {}
   virtual ~MockSyntheticGestureTarget() {}
 
   // SyntheticGestureTarget:
   virtual void DispatchInputEventToPlatform(const InputEvent& event) OVERRIDE {}
 
   virtual void OnSyntheticGestureCompleted(
-      SyntheticGestureNew::Result result) OVERRIDE {
-    DCHECK_NE(result, SyntheticGestureNew::GESTURE_RUNNING);
-    if (result == SyntheticGestureNew::GESTURE_FINISHED)
+      SyntheticGesture::Result result) OVERRIDE {
+    DCHECK_NE(result, SyntheticGesture::GESTURE_RUNNING);
+    if (result == SyntheticGesture::GESTURE_FINISHED)
       num_success_++;
     else
       num_failure_++;
   }
 
   virtual void SetNeedsFlush() OVERRIDE {
     flush_requested_ = true;
   }
 
   virtual SyntheticGestureParams::GestureSourceType
@@ skipping 19 matching lines @@
   bool flush_requested_;
 };
 
 class MockSyntheticSmoothScrollMouseTarget : public MockSyntheticGestureTarget {
  public:
   MockSyntheticSmoothScrollMouseTarget() : scroll_distance_(0) {}
   virtual ~MockSyntheticSmoothScrollMouseTarget() {}
 
   virtual void DispatchInputEventToPlatform(const InputEvent& event) OVERRIDE {
     const blink::WebInputEvent* web_event = event.web_event.get();
-    DCHECK_EQ(web_event->type, blink::WebInputEvent::MouseWheel);
+    ASSERT_EQ(web_event->type, blink::WebInputEvent::MouseWheel);
     const blink::WebMouseWheelEvent* mouse_wheel_event =
         static_cast<const blink::WebMouseWheelEvent*>(web_event);
-    DCHECK_EQ(mouse_wheel_event->deltaX, 0);
+    ASSERT_EQ(mouse_wheel_event->deltaX, 0);
     scroll_distance_ -= mouse_wheel_event->deltaY;
   }
 
   float scroll_distance() const { return scroll_distance_; }
 
  private:
   float scroll_distance_;
 };
 
 class MockSyntheticSmoothScrollTouchTarget : public MockSyntheticGestureTarget {
@@ skipping 89 matching lines @@
   float total_num_pixels_covered() const { return total_num_pixels_covered_; }
   ZoomDirection zoom_direction() const { return zoom_direction_; }
 
  private:
   ZoomDirection ComputeZoomDirection(float last_pointer_distance,
                                      float current_pointer_distance) {
     DCHECK_NE(last_pointer_distance, current_pointer_distance);
     return last_pointer_distance < current_pointer_distance ? ZOOM_IN
                                                             : ZOOM_OUT;
   }
+
   float total_num_pixels_covered_;
   float last_pointer_distance_;
   ZoomDirection zoom_direction_;
   gfx::PointF start_0_;
   gfx::PointF start_1_;
   bool started_;
 };
 
-class SyntheticGestureControllerNewTest : public testing::Test {
+class SyntheticGestureControllerTest : public testing::Test {
  public:
-  SyntheticGestureControllerNewTest() {}
-  virtual ~SyntheticGestureControllerNewTest() {}
+  SyntheticGestureControllerTest() {}
+  virtual ~SyntheticGestureControllerTest() {}
 
  protected:
   template<typename MockGestureTarget>
   void CreateControllerAndTarget() {
     target_ = new MockGestureTarget();
 
-    controller_.reset(new SyntheticGestureControllerNew(
+    controller_.reset(new SyntheticGestureController(
         scoped_ptr<SyntheticGestureTarget>(target_)));
   }
 
   virtual void SetUp() OVERRIDE {
     time_ = base::TimeTicks::Now();
   }
 
   virtual void TearDown() OVERRIDE {
     controller_.reset();
     target_ = NULL;
     time_ = base::TimeTicks();
   }
 
   void FlushInputUntilComplete() {
     while (target_->flush_requested()) {
       target_->ClearFlushRequest();
       time_ += base::TimeDelta::FromMilliseconds(kFlushInputRateInMs);
       controller_->Flush(time_);
     }
   }
 
   MockSyntheticGestureTarget* target_;
-  scoped_ptr<SyntheticGestureControllerNew> controller_;
+  scoped_ptr<SyntheticGestureController> controller_;
   base::TimeTicks time_;
 };
 
-TEST_F(SyntheticGestureControllerNewTest, SingleGesture) {
+TEST_F(SyntheticGestureControllerTest, SingleGesture) {
   CreateControllerAndTarget<MockSyntheticGestureTarget>();
 
   bool finished;
   scoped_ptr<MockSyntheticGesture> gesture(
       new MockSyntheticGesture(&finished, 3));
-  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
+  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_TRUE(finished);
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, GestureFailed) {
+TEST_F(SyntheticGestureControllerTest, GestureFailed) {
   CreateControllerAndTarget<MockSyntheticGestureTarget>();
 
   bool finished;
   scoped_ptr<MockSyntheticGesture> gesture(
       new MockSyntheticGesture(&finished, 0));
-  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
+  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_TRUE(finished);
   EXPECT_EQ(1, target_->num_failure());
   EXPECT_EQ(0, target_->num_success());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, SuccessiveGestures) {
+TEST_F(SyntheticGestureControllerTest, SuccessiveGestures) {
   CreateControllerAndTarget<MockSyntheticGestureTarget>();
 
   bool finished_1, finished_2;
   scoped_ptr<MockSyntheticGesture> gesture_1(
       new MockSyntheticGesture(&finished_1, 2));
   scoped_ptr<MockSyntheticGesture> gesture_2(
       new MockSyntheticGesture(&finished_2, 4));
 
   // Queue first gesture and wait for it to finish
-  controller_->QueueSyntheticGesture(gesture_1.PassAs<SyntheticGestureNew>());
+  controller_->QueueSyntheticGesture(gesture_1.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_TRUE(finished_1);
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
 
   // Queue second gesture.
-  controller_->QueueSyntheticGesture(gesture_2.PassAs<SyntheticGestureNew>());
+  controller_->QueueSyntheticGesture(gesture_2.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_TRUE(finished_2);
   EXPECT_EQ(2, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, TwoGesturesInFlight) {
+TEST_F(SyntheticGestureControllerTest, TwoGesturesInFlight) {
   CreateControllerAndTarget<MockSyntheticGestureTarget>();
 
   bool finished_1, finished_2;
   scoped_ptr<MockSyntheticGesture> gesture_1(
       new MockSyntheticGesture(&finished_1, 2));
   scoped_ptr<MockSyntheticGesture> gesture_2(
       new MockSyntheticGesture(&finished_2, 4));
 
-  controller_->QueueSyntheticGesture(gesture_1.PassAs<SyntheticGestureNew>());
-  controller_->QueueSyntheticGesture(gesture_2.PassAs<SyntheticGestureNew>());
+  controller_->QueueSyntheticGesture(gesture_1.PassAs<SyntheticGesture>());
+  controller_->QueueSyntheticGesture(gesture_2.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_TRUE(finished_1);
   EXPECT_TRUE(finished_2);
 
   EXPECT_EQ(2, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, SmoothScrollGestureTouch) {
+TEST_F(SyntheticGestureControllerTest, SmoothScrollGestureTouch) {
   CreateControllerAndTarget<MockSyntheticSmoothScrollTouchTarget>();
 
   SyntheticSmoothScrollGestureParams params;
   params.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   params.distance = 100;
 
-  scoped_ptr<SyntheticSmoothScrollGestureNew> gesture(
-      new SyntheticSmoothScrollGestureNew(params));
-  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
+  scoped_ptr<SyntheticSmoothScrollGesture> gesture(
+      new SyntheticSmoothScrollGesture(params));
+  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
   EXPECT_LE(params.distance, static_cast<MockSyntheticSmoothScrollTouchTarget*>(
                                  target_)->scroll_distance());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, SmoothScrollGestureMouse) {
+TEST_F(SyntheticGestureControllerTest, SmoothScrollGestureMouse) {
   CreateControllerAndTarget<MockSyntheticSmoothScrollMouseTarget>();
 
   SyntheticSmoothScrollGestureParams params;
   params.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
   params.distance = -100;
 
-  scoped_ptr<SyntheticSmoothScrollGestureNew> gesture(
-      new SyntheticSmoothScrollGestureNew(params));
-  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
+  scoped_ptr<SyntheticSmoothScrollGesture> gesture(
+      new SyntheticSmoothScrollGesture(params));
+  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
   EXPECT_GE(params.distance, static_cast<MockSyntheticSmoothScrollTouchTarget*>(
                                  target_)->scroll_distance());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, PinchGestureTouchZoomIn) {
+TEST_F(SyntheticGestureControllerTest, PinchGestureTouchZoomIn) {
   CreateControllerAndTarget<MockSyntheticPinchTouchTarget>();
 
   SyntheticPinchGestureParams params;
   params.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   params.zoom_in = true;
   params.total_num_pixels_covered = 100;
 
-  scoped_ptr<SyntheticPinchGestureNew> gesture(
-      new SyntheticPinchGestureNew(params));
-  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
+  scoped_ptr<SyntheticPinchGesture> gesture(
+      new SyntheticPinchGesture(params));
+  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
   EXPECT_EQ(
       static_cast<MockSyntheticPinchTouchTarget*>(target_)->zoom_direction(),
       MockSyntheticPinchTouchTarget::ZOOM_IN);
   EXPECT_LE(
       params.total_num_pixels_covered,
       static_cast<MockSyntheticPinchTouchTarget*>(target_)
           ->total_num_pixels_covered());
 }
 
-TEST_F(SyntheticGestureControllerNewTest, PinchGestureTouchZoomOut) {
+TEST_F(SyntheticGestureControllerTest, PinchGestureTouchZoomOut) {
   CreateControllerAndTarget<MockSyntheticPinchTouchTarget>();
 
   SyntheticPinchGestureParams params;
   params.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   params.zoom_in = false;
   params.total_num_pixels_covered = 100;
 
-  scoped_ptr<SyntheticPinchGestureNew> gesture(
-      new SyntheticPinchGestureNew(params));
-  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
+  scoped_ptr<SyntheticPinchGesture> gesture(
+      new SyntheticPinchGesture(params));
+  controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGesture>());
   FlushInputUntilComplete();
 
   EXPECT_EQ(1, target_->num_success());
   EXPECT_EQ(0, target_->num_failure());
   EXPECT_EQ(
       static_cast<MockSyntheticPinchTouchTarget*>(target_)->zoom_direction(),
       MockSyntheticPinchTouchTarget::ZOOM_OUT);
   EXPECT_LE(
       params.total_num_pixels_covered,
       static_cast<MockSyntheticPinchTouchTarget*>(target_)
           ->total_num_pixels_covered());
 }
 
 }  // namespace
 
 }  // namespace content