Fix AwContentsClientShouldInterceptRequestTest#testBaseUrlOfLoadDataSentInRefererHeader with PlzNav…

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
index a672ca13bffc8f81f4d81eb416624fc862669717..23dbe08429857db455d909275b1e40f4aa6f9fc9 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
@@ -826,7 +826,14 @@ public class AwContentsClientShouldInterceptRequestTest extends AwTestBase {
         loadDataWithBaseUrlAsync(mAwContents, pageHtml, "text/html", false, baseUrl, null);
         mShouldInterceptRequestHelper.waitForCallback(callCount, 1);
         assertEquals(1, mShouldInterceptRequestHelper.getUrls().size());
-        assertEquals(imageUrl, mShouldInterceptRequestHelper.getUrls().get(0));
+        if (!mShouldInterceptRequestHelper.getUrls().get(0).equals(imageUrl)) {
+            // With PlzNavigate, data URLs are intercepted so wait for the next request.
+            // See https://codereview.chromium.org/2235303002/.
+            callCount = mShouldInterceptRequestHelper.getCallCount();
+            mShouldInterceptRequestHelper.waitForCallback(callCount, 1);
+            assertEquals(imageUrl, mShouldInterceptRequestHelper.getUrls().get(1));
+        }
+
         Map<String, String> headers =
                 mShouldInterceptRequestHelper.getRequestsForUrl(imageUrl).requestHeaders;
         assertTrue(headers.containsKey(refererHeaderName));