Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1766)

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java

Issue 143803017: FindBugs: Rename org.chromium.base.test.util.ScalableTimeout.ScaleTimeout to scaleTimeout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698