Merge "Make Navigation APIs unexperimental" into androidx-main

Author: JustJoZa

webkit/integration-tests/instrumentation/src/androidTest/java/androidx/webkit/NavigationClientTest.java

@@ -82,8 +82,6 @@ private static class RecordingNavigationListener implements NavigationListener {
         public final BlockingQueue<Page> mOnPageDomContentLoadedEventFiredQueue =
                 new LinkedBlockingQueue<>();
 
-        public final BlockingQueue<Pair<Page, Long>> mOnFirstContentfulPaintMicrosQueue =
-                new LinkedBlockingQueue<>();
         public final BlockingQueue<Pair<Page, Long>> mOnFirstContentfulPaintQueue =
                 new LinkedBlockingQueue<>();
         public final BlockingQueue<Pair<Page, Long>> mOnLargestContentfulPaintQueue =
@@ -124,11 +122,6 @@ public void onPageDomContentLoadedEvent(@NonNull Page page) {
 
         }
 
-        @Override
-        public void onFirstContentfulPaint(@NonNull Page page, long fcpDurationUs) {
-            mOnFirstContentfulPaintMicrosQueue.add(new Pair<>(page, fcpDurationUs));
-        }
-
         @Override
         public void onFirstContentfulPaintMillis(@NonNull Page page, long fcpDurationMs) {
             mOnFirstContentfulPaintQueue.add(new Pair<>(page, fcpDurationMs));
@@ -151,7 +144,6 @@ public void clearRecordedEvents() {
             mOnPageDeletedQueue.clear();
             mOnPageLoadEventFiredQueue.clear();
             mOnPageDomContentLoadedEventFiredQueue.clear();
-            mOnFirstContentfulPaintMicrosQueue.clear();
             mOnFirstContentfulPaintQueue.clear();
             mOnLargestContentfulPaintQueue.clear();
             mOnPerformanceMarkQueue.clear();
@@ -161,7 +153,7 @@ public void clearRecordedEvents() {
 
     @Before
     public void setUp() throws Exception {
-        WebkitUtils.checkFeature((WebViewFeature.NAVIGATION_LISTENER_V1));
+        WebkitUtils.checkFeature((WebViewFeature.NAVIGATION_LISTENER));
         mWebViewOnUiThread = new WebViewOnUiThread();
         mWebServer = new MockWebServer();
         mWebServer.setDispatcher(new TestDispatcher());
@@ -356,12 +348,6 @@ public void isSamePageObject() {
             Page domContentLoadedPage = waitForNextQueueElement(
                     mListener.mOnPageDomContentLoadedEventFiredQueue);
             Assert.assertEquals(navigationCompletePage, domContentLoadedPage);
-
-            Pair<Page, Long> firstContentfulPaintMicros = waitForNextQueueElement(
-                    mListener.mOnFirstContentfulPaintMicrosQueue);
-            Page firstContentfulPaintMicrosPage = firstContentfulPaintMicros.first;
-            Assert.assertEquals(navigationCompletePage, firstContentfulPaintMicrosPage);
-            Assert.assertTrue(firstContentfulPaintMicros.second > 0);
         }
 
         // Tearing down the activity and WebView will delete the page.
@@ -370,8 +356,8 @@ public void isSamePageObject() {
     }
 
     @Test
-    public void isSamePageObject_listenerV2() throws Exception {
-        WebkitUtils.checkFeature(WebViewFeature.NAVIGATION_LISTENER_V2);
+    public void isSamePageObject_listener() throws Exception {
+        WebkitUtils.checkFeature(WebViewFeature.NAVIGATION_LISTENER);
         // Success URL is obtained outside of the activity scope in order to avoid a
         // StrictModeViolation for attempting to resolve the hostname on the main thread.
         final String successUrl = getSuccessUrl();
@@ -426,7 +412,7 @@ public void isSamePageObject_listenerV2() throws Exception {
 
     @Test
     public void isSamePageObject_sameUrl() {
-        WebkitUtils.checkFeature(WebViewFeature.PAGE_GET_URL);
+        WebkitUtils.checkFeature(WebViewFeature.NAVIGATION_LISTENER);
         final String successUrl = getSuccessUrl();
         mWebViewOnUiThread.loadUrl(successUrl);
         Navigation completedNavigation = waitForNextQueueElement(