Deflake RedirectHandlerTest

Don't assume that time doesn't proceed between two calls to
updateNewUrlLoading.

Bug: 1096237
Change-Id: Id6e4089b94f6c4dd3c89d321430faf54fc6c9272
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250041Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#779787}

components/external_intents/android/javatests/src/org/chromium/components/external_intents/RedirectHandlerTest.java

@@ -360,12 +360,11 @@ public class RedirectHandlerTest {
         Assert.assertFalse(handler.shouldStayInApp(false));
         Assert.assertFalse(handler.shouldStayInApp(true));
 
-        handler.updateNewUrlLoading(
-                PageTransition.LINK, false, false, SystemClock.elapsedRealtime(), 0);
+        long lastUserInteractionTime = SystemClock.elapsedRealtime();
+        handler.updateNewUrlLoading(PageTransition.LINK, false, false, lastUserInteractionTime, 0);
         Assert.assertTrue(handler.shouldStayInApp(false));
         Assert.assertTrue(handler.shouldStayInApp(true));
-        handler.updateNewUrlLoading(
-                PageTransition.LINK, false, false, SystemClock.elapsedRealtime(), 1);
+        handler.updateNewUrlLoading(PageTransition.LINK, false, false, lastUserInteractionTime, 1);
         Assert.assertTrue(handler.shouldStayInApp(false));
         Assert.assertTrue(handler.shouldStayInApp(true));
 
@@ -392,12 +391,12 @@ public class RedirectHandlerTest {
         Assert.assertFalse(handler.shouldStayInApp(false));
         Assert.assertFalse(handler.shouldStayInApp(true));
 
+        long lastUserInteractionTime = SystemClock.elapsedRealtime();
         handler.updateNewUrlLoading(
-                PageTransition.RELOAD, false, false, SystemClock.elapsedRealtime(), 0);
+                PageTransition.RELOAD, false, false, lastUserInteractionTime, 0);
         Assert.assertTrue(handler.shouldStayInApp(false));
         Assert.assertTrue(handler.shouldStayInApp(true));
-        handler.updateNewUrlLoading(
-                PageTransition.LINK, false, false, SystemClock.elapsedRealtime(), 1);
+        handler.updateNewUrlLoading(PageTransition.LINK, false, false, lastUserInteractionTime, 1);
         Assert.assertTrue(handler.shouldStayInApp(false));
         Assert.assertTrue(handler.shouldStayInApp(true));
 
@@ -424,12 +423,12 @@ public class RedirectHandlerTest {
         Assert.assertFalse(handler.shouldStayInApp(false));
         Assert.assertFalse(handler.shouldStayInApp(true));
 
+        long lastUserInteractionTime = SystemClock.elapsedRealtime();
         handler.updateNewUrlLoading(PageTransition.FORM_SUBMIT | PageTransition.FORWARD_BACK, false,
-                true, SystemClock.elapsedRealtime(), 0);
+                true, lastUserInteractionTime, 0);
         Assert.assertTrue(handler.shouldStayInApp(false));
         Assert.assertTrue(handler.shouldStayInApp(true));
-        handler.updateNewUrlLoading(
-                PageTransition.LINK, false, false, SystemClock.elapsedRealtime(), 1);
+        handler.updateNewUrlLoading(PageTransition.LINK, false, false, lastUserInteractionTime, 1);
         Assert.assertTrue(handler.shouldStayInApp(false));
         Assert.assertTrue(handler.shouldStayInApp(true));