Pass gesture detector config type when enabling touch emulator.

content/browser/renderer_host/input/touch_emulator_unittest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
@@ skipping 35 matching lines @@
 
   // testing::Test
   void SetUp() override {
 #if defined(USE_AURA)
     aura::Env::CreateInstance(true);
     screen_.reset(aura::TestScreen::Create(gfx::Size()));
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 #endif
 
     emulator_.reset(new TouchEmulator(this));
-    emulator_->Enable();
+    emulator_->Enable(ui::GestureProviderConfigType::GENERIC_MOBILE);
   }
 
   void TearDown() override {
     emulator_->Disable();
     EXPECT_EQ("", ExpectedEvents());
 
 #if defined(USE_AURA)
     aura::Env::DeleteInstance();
     screen_.reset();
 #endif
@@ skipping 299 matching lines @@
   EXPECT_EQ("TouchMove GesturePinchBegin", ExpectedEvents());
 
   // Disable while pinch is in progress.
   emulator()->Disable();
   EXPECT_EQ("TouchCancel GesturePinchEnd GestureScrollEnd", ExpectedEvents());
   MouseUp(300, 200);
   ReleaseShift();
   MouseMove(300, 300);
   EXPECT_EQ("", ExpectedEvents());
 
-  emulator()->Enable();
+  emulator()->Enable(ui::GestureProviderConfigType::GENERIC_MOBILE);
   MouseDown(300, 300);
   EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
   MouseDrag(300, 400);
+  EXPECT_EQ(
+      "TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate",
+      ExpectedEvents());
+
+  // Disable while scroll is in progress.
+  emulator()->Disable();
+  EXPECT_EQ("TouchCancel GestureScrollEnd", ExpectedEvents());
+}
+
+TEST_F(TouchEmulatorTest, DisableAndReenableDifferentConfig) {
+  MouseDown(100, 200);
+  EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
+  MouseDrag(200, 200);
+  EXPECT_EQ(
+      "TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate",
+      ExpectedEvents());
+  PressShift();
+  MouseDrag(300, 200);
+  EXPECT_EQ("TouchMove GesturePinchBegin", ExpectedEvents());
+
+  // Disable while pinch is in progress.
+  emulator()->Disable();
+  EXPECT_EQ("TouchCancel GesturePinchEnd GestureScrollEnd", ExpectedEvents());
+  MouseUp(300, 200);
+  ReleaseShift();
+  MouseMove(300, 300);
+  EXPECT_EQ("", ExpectedEvents());
+
+  emulator()->Enable(ui::GestureProviderConfigType::GENERIC_DESKTOP);
+  MouseDown(300, 300);
+  EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
+  MouseDrag(300, 400);
   EXPECT_EQ(
       "TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate",
       ExpectedEvents());
 
   // Disable while scroll is in progress.
   emulator()->Disable();
   EXPECT_EQ("TouchCancel GestureScrollEnd", ExpectedEvents());
 }
 
 TEST_F(TouchEmulatorTest, MouseMovesDropped) {
@@ skipping 36 matching lines @@
   EXPECT_FALSE(SendMouseWheelEvent());
   MouseUp(100, 200);
   EXPECT_EQ("TouchEnd GestureShowPress GestureTap", ExpectedEvents());
   EXPECT_TRUE(SendMouseWheelEvent());
   MouseDown(300, 200);
   EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
   EXPECT_FALSE(SendMouseWheelEvent());
   emulator()->Disable();
   EXPECT_EQ("TouchCancel GestureTapCancel", ExpectedEvents());
   EXPECT_TRUE(SendMouseWheelEvent());
-  emulator()->Enable();
+  emulator()->Enable(ui::GestureProviderConfigType::GENERIC_MOBILE);
   EXPECT_TRUE(SendMouseWheelEvent());
 }
 
 TEST_F(TouchEmulatorTest, MultipleTouchStreams) {
   // Native stream should be blocked while emulated is active.
   MouseMove(100, 200);
   EXPECT_EQ("", ExpectedEvents());
   MouseDown(100, 200);
   EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
   EXPECT_FALSE(TouchStart(10, 10, true));
   EXPECT_FALSE(TouchMove(20, 20, true));
   MouseUp(200, 200);
   EXPECT_EQ(
       "TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate"
       " TouchEnd GestureScrollEnd",
       ExpectedEvents());
   EXPECT_FALSE(TouchEnd(20, 20, true));
 
   // Emulated stream should be blocked while native is active.
   EXPECT_TRUE(TouchStart(10, 10, true));
   EXPECT_TRUE(TouchMove(20, 20, true));
   MouseDown(300, 200);
   EXPECT_EQ("", ExpectedEvents());
   // Re-enabling in the middle of a touch sequence should not affect this.
   emulator()->Disable();
-  emulator()->Enable();
+  emulator()->Enable(ui::GestureProviderConfigType::GENERIC_MOBILE);
   MouseDrag(300, 300);
   EXPECT_EQ("", ExpectedEvents());
   MouseUp(300, 300);
   EXPECT_EQ("", ExpectedEvents());
   EXPECT_TRUE(TouchEnd(20, 20, true));
   EXPECT_EQ("", ExpectedEvents());
 
   // Late ack for TouchEnd should not mess things up.
   EXPECT_TRUE(TouchStart(10, 10, false));
   EXPECT_TRUE(TouchMove(20, 20, false));
   emulator()->Disable();
   EXPECT_TRUE(TouchEnd(20, 20, false));
   EXPECT_TRUE(TouchStart(30, 30, false));
   AckOldestTouchEvent(); // TouchStart.
-  emulator()->Enable();
+  emulator()->Enable(ui::GestureProviderConfigType::GENERIC_MOBILE);
   AckOldestTouchEvent(); // TouchMove.
   AckOldestTouchEvent(); // TouchEnd.
   MouseDown(300, 200);
   EXPECT_EQ("", ExpectedEvents());
   MouseDrag(300, 300);
   EXPECT_EQ("", ExpectedEvents());
   MouseUp(300, 300);
   EXPECT_EQ("", ExpectedEvents());
   AckOldestTouchEvent(); // TouchStart.
   MouseDown(300, 200);
@@ skipping 25 matching lines @@
   MouseDown(100, 200);
   EXPECT_EQ("TouchStart GestureTapDown", ExpectedEvents());
   MouseUp(200, 200);
   EXPECT_EQ(
       "TouchMove GestureTapCancel GestureScrollBegin GestureScrollUpdate"
       " TouchEnd GestureScrollEnd",
       ExpectedEvents());
 }
 
 }  // namespace content