[WebLayer] Guard call to isKnownProtocol() in NavigationTest.java

Navigation#isKnownProtocol() was added in 89, but I mistakenly added a
call to it without guarding by version in NavigationTest.java. That call
causes skew tests to break. This CL adds the guard, which necessitates
making the inner class from which the method is called not a static
class so that it can access the test's activity rule.

Bug: 1155275
Change-Id: I14d02fc87bb1a5cbc54f2ea116b01c689e384a71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616230Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841537}

weblayer/browser/android/javatests/src/org/chromium/weblayer/test/NavigationTest.java

@@ -43,6 +43,7 @@ import org.chromium.weblayer.NavigationState;
 import org.chromium.weblayer.Tab;
 import org.chromium.weblayer.TabCallback;
 import org.chromium.weblayer.TabListCallback;
+import org.chromium.weblayer.WebLayer;
 import org.chromium.weblayer.shell.InstrumentationActivity;
 
 import java.io.ByteArrayInputStream;
@@ -90,8 +91,8 @@ public class NavigationTest {
                 Fragment fragment, Intent intent, int requestCode, Bundle options) {}
     }
 
-    private static class Callback extends NavigationCallback {
-        public static class NavigationCallbackHelper extends CallbackHelper {
+    private class Callback extends NavigationCallback {
+        public class NavigationCallbackHelper extends CallbackHelper {
             private Uri mUri;
             private boolean mIsSameDocument;
             private int mHttpStatusCode;
@@ -109,10 +110,15 @@ public class NavigationTest {
                 mRedirectChain = navigation.getRedirectChain();
                 mLoadError = navigation.getLoadError();
                 mNavigationState = navigation.getState();
-                mIsKnownProtocol = navigation.isKnownProtocol();
                 mIsPageInitiatedNavigation = navigation.isPageInitiated();
                 mIsServedFromBackForwardCache = navigation.isServedFromBackForwardCache();
                 notifyCalled();
+
+                int majorVersion = TestThreadUtils.runOnUiThreadBlockingNoException(
+                        () -> WebLayer.getSupportedMajorVersion(mActivityTestRule.getActivity()));
+                if (majorVersion >= 89) {
+                    mIsKnownProtocol = navigation.isKnownProtocol();
+                }
             }
 
             public void assertCalledWith(int currentCallCount, String uri) throws TimeoutException {
@@ -162,7 +168,7 @@ public class NavigationTest {
             }
         }
 
-        public static class UriCallbackHelper extends CallbackHelper {
+        public class UriCallbackHelper extends CallbackHelper {
             private Uri mUri;
 
             public void notifyCalled(Uri uri) {
@@ -175,7 +181,7 @@ public class NavigationTest {
             }
         }
 
-        public static class NavigationCallbackValueRecorder {
+        public class NavigationCallbackValueRecorder {
             private List<String> mObservedValues =
                     Collections.synchronizedList(new ArrayList<String>());
 
@@ -193,7 +199,7 @@ public class NavigationTest {
             }
         }
 
-        public static class FirstContentfulPaintCallbackHelper extends CallbackHelper {
+        public class FirstContentfulPaintCallbackHelper extends CallbackHelper {
             private long mNavigationStartMillis;
             private long mFirstContentfulPaintMs;
 
@@ -212,7 +218,7 @@ public class NavigationTest {
             }
         }
 
-        public static class LargestContentfulPaintCallbackHelper extends CallbackHelper {
+        public class LargestContentfulPaintCallbackHelper extends CallbackHelper {
             private long mNavigationStartMillis;
             private long mLargestContentfulPaintMs;