Fix org.chromium.android_webview.test.AwSettingsTest#testUpdatingUserAgentWhileLoadingCausesReload …

android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index cff656833bdc416c079bb8e699f3f73d5be0d211..b10e50e2a59e577681d046b14e90d6a4b14ba26d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -23,6 +23,7 @@ import android.webkit.WebSettings.LayoutAlgorithm;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.AwWebResourceResponse;
+import org.chromium.android_webview.test.TestAwContentsClient.DoUpdateVisitedHistoryHelper;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.ImagePageGenerator;
 import org.chromium.android_webview.test.util.JSUtils;
@@ -36,7 +37,6 @@ import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.HistoryUtils;
-import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.net.test.EmbeddedTestServer;
 import org.chromium.net.test.util.TestWebServer;
@@ -2872,14 +2872,13 @@ public class AwSettingsTest extends AwTestBase {
                     }
             );
 
-            TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
-                    contentClient.getOnPageFinishedHelper();
-            int initialCallCount = onPageFinishedHelper.getCallCount();
-            loadUrlSync(awContents, onPageFinishedHelper, url);
-            // loadUrlSync only waits for a single onPageFinished, now wait for another one.
-            onPageFinishedHelper.waitForCallback(initialCallCount + 1, 1, WAIT_TIMEOUT_MS,
-                    TimeUnit.MILLISECONDS);
-            assertEquals(url, onPageFinishedHelper.getUrl());
+            DoUpdateVisitedHistoryHelper doUpdateVisitedHistoryHelper =
+                    contentClient.getDoUpdateVisitedHistoryHelper();
+            int callCount = doUpdateVisitedHistoryHelper.getCallCount();
+            loadUrlAsync(awContents, url);
+            doUpdateVisitedHistoryHelper.waitForCallback(callCount);
+            assertEquals(url, doUpdateVisitedHistoryHelper.getUrl());
+            assertEquals(true, doUpdateVisitedHistoryHelper.getIsReload());
         } finally {
             if (httpServer != null) {
                 httpServer.shutdown();