| Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
|
| index 0d9a1e3443b79277f2386b76aadbcc878d26f6ee..11bba3deab8723dad87f43829bace7e125e1fa79 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java
|
| @@ -367,11 +367,11 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
|
| });
|
|
|
| assertTrue(mMockMotionEventDelegate.mShowPressCalled.await(
|
| - ScalableTimeout.ScaleTimeout(ViewConfiguration.getTapTimeout() + 10),
|
| + ScalableTimeout.scaleTimeout(ViewConfiguration.getTapTimeout() + 10),
|
| TimeUnit.MILLISECONDS));
|
|
|
| assertTrue(mMockMotionEventDelegate.mLongPressCalled.await(
|
| - ScalableTimeout.ScaleTimeout(ViewConfiguration.getLongPressTimeout()
|
| + ScalableTimeout.scaleTimeout(ViewConfiguration.getLongPressTimeout()
|
| + ViewConfiguration.getTapTimeout() + 10),
|
| TimeUnit.MILLISECONDS));
|
|
|
| @@ -931,7 +931,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
|
| });
|
|
|
| assertFalse(mMockMotionEventDelegate.mLongPressCalled.await(
|
| - ScalableTimeout.ScaleTimeout(ViewConfiguration.getLongPressTimeout()
|
| + ScalableTimeout.scaleTimeout(ViewConfiguration.getLongPressTimeout()
|
| + ViewConfiguration.getTapTimeout() + 10),
|
| TimeUnit.MILLISECONDS));
|
|
|
| @@ -967,7 +967,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
|
| });
|
|
|
| assertTrue(mMockMotionEventDelegate.mLongPressCalled.await(
|
| - ScalableTimeout.ScaleTimeout(ViewConfiguration.getLongPressTimeout()
|
| + ScalableTimeout.scaleTimeout(ViewConfiguration.getLongPressTimeout()
|
| + ViewConfiguration.getTapTimeout() + 10),
|
| TimeUnit.MILLISECONDS));
|
|
|
| @@ -1007,7 +1007,7 @@ public class ContentViewGestureHandlerTest extends InstrumentationTestCase {
|
| final long longPressTimeoutMs = ViewConfiguration.getLongPressTimeout()
|
| + ViewConfiguration.getTapTimeout() + 10;
|
| assertTrue(mMockMotionEventDelegate.mLongPressCalled.await(
|
| - ScalableTimeout.ScaleTimeout(longPressTimeoutMs), TimeUnit.MILLISECONDS));
|
| + ScalableTimeout.scaleTimeout(longPressTimeoutMs), TimeUnit.MILLISECONDS));
|
|
|
| assertEquals("A LONG_PRESS gesture should have been sent",
|
| ContentViewGestureHandler.GESTURE_LONG_PRESS,
|
|
|