Android: inline deprecated BuildInfo methods (/android_webview)

No change to logic. This inlines BuildInfo.isAtLeast{Q,R} and
BuildInfo.targetsAtLeast{Q,R} (and their C++ equivalents) in
/android_webview.

The methods themselves will be removed in a follow-up CL once all call
sites have been removed.

This CL was uploaded by git cl split.

R=boliu@chromium.org

Bug: 1106920
Test: autoninja -C out/Default monochrome_public_apk
Change-Id: I7c772186e1d54f5e4e6e2b36aaa08ca350124bf7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2575326
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Auto-Submit: Nate Fischer <ntfschr@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833879}

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

@@ -65,7 +65,6 @@ import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.AwThreadUtils;
 import org.chromium.android_webview.gfx.AwDrawFnImpl;
 import org.chromium.android_webview.renderer_priority.RendererPriority;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.ScopedSysTraceEvent;
@@ -2537,7 +2536,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate
 
         @Override
         public AwDrawFnImpl.DrawFnAccess getDrawFnAccess() {
-            if (BuildInfo.isAtLeastQ()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 return mFactory.getWebViewDelegate();
             }
             return null;

android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java

@@ -342,7 +342,7 @@ public class WebViewChromiumAwInit {
     private void initPlatSupportLibrary() {
         try (ScopedSysTraceEvent e = ScopedSysTraceEvent.scoped(
                      "WebViewChromiumAwInit.initPlatSupportLibrary")) {
-            if (BuildInfo.isAtLeastQ()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 AwDrawFnImpl.setDrawFnFunctionTable(DrawFunctor.getDrawFnFunctionTable());
             }
             DrawGLFunctor.setChromiumAwDrawGLFunction(AwContents.getAwDrawGLFunction());

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -58,7 +58,6 @@ import org.chromium.android_webview.gfx.RectUtils;
 import org.chromium.android_webview.permission.AwGeolocationCallback;
 import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.android_webview.renderer_priority.RendererPriority;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.Callback;
 import org.chromium.base.CommandLine;
 import org.chromium.base.ContextUtils;
@@ -1932,7 +1931,9 @@ public class AwContents implements SmartClipProvider {
         if (TRACE) Log.i(TAG, "%s loadData", this);
         if (isDestroyed(WARN)) return;
         if (data != null && data.contains("#")) {
-            if (!BuildInfo.targetsAtLeastQ() && !isBase64Encoded(encoding)) {
+            if (ContextUtils.getApplicationContext().getApplicationInfo().targetSdkVersion
+                            < Build.VERSION_CODES.Q
+                    && !isBase64Encoded(encoding)) {
                 // As of Chromium M72, data URI parsing strictly enforces encoding of '#'. To
                 // support WebView applications which were not expecting this change, we do it for
                 // them.

android_webview/java/src/org/chromium/android_webview/AwSettings.java

@@ -21,7 +21,6 @@ import org.chromium.android_webview.common.AwFeatures;
 import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConfigHelper;
 import org.chromium.android_webview.settings.ForceDarkBehavior;
 import org.chromium.android_webview.settings.ForceDarkMode;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
@@ -294,7 +293,9 @@ public class AwSettings {
             mDoNotUpdateSelectionOnMutatingSelectionRange =
                     doNotUpdateSelectionOnMutatingSelectionRange;
 
-            mAllowFileUrlAccess = !BuildInfo.targetsAtLeastR();
+            mAllowFileUrlAccess =
+                    ContextUtils.getApplicationContext().getApplicationInfo().targetSdkVersion
+                    < Build.VERSION_CODES.R;
         }
         // Defer initializing the native side until a native WebContents instance is set.
     }

android_webview/java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConversionHelper.java

@@ -4,9 +4,10 @@
 
 package org.chromium.android_webview.safe_browsing;
 
+import android.os.Build;
 import android.webkit.WebViewClient;
 
-import org.chromium.base.BuildInfo;
+import org.chromium.base.ContextUtils;
 import org.chromium.components.safe_browsing.SBThreatType;
 
 /**
@@ -53,8 +54,10 @@ public final class AwSafeBrowsingConversionHelper {
             case SBThreatType.URL_UNWANTED:
                 return SAFE_BROWSING_THREAT_UNWANTED_SOFTWARE;
             case SBThreatType.BILLING:
-                return BuildInfo.targetsAtLeastQ() ? SAFE_BROWSING_THREAT_BILLING
-                                                   : SAFE_BROWSING_THREAT_UNKNOWN;
+                return ContextUtils.getApplicationContext().getApplicationInfo().targetSdkVersion
+                                >= Build.VERSION_CODES.Q
+                        ? SAFE_BROWSING_THREAT_BILLING
+                        : SAFE_BROWSING_THREAT_UNKNOWN;
             default:
                 return SAFE_BROWSING_THREAT_UNKNOWN;
         }

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

@@ -12,6 +12,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -38,7 +39,7 @@ import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.renderer_priority.RendererPriority;
 import org.chromium.android_webview.test.TestAwContentsClient.OnDownloadStartHelper;
 import org.chromium.android_webview.test.util.CommonResources;
-import org.chromium.base.BuildInfo;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.CallbackHelper;
@@ -957,7 +958,9 @@ public class AwContentsTest {
         final AwContents awContents = testView.getAwContents();
 
         // Before Android Q, the loadData API is expected to handle the encoding for users.
-        boolean encodeOctothorpes = !BuildInfo.targetsAtLeastQ();
+        boolean encodeOctothorpes =
+                ContextUtils.getApplicationContext().getApplicationInfo().targetSdkVersion
+                < Build.VERSION_CODES.Q;
 
         // A URL with no '#' character.
         mActivityTestRule.loadDataSync(awContents, mContentsClient.getOnPageFinishedHelper(),

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

@@ -6,6 +6,7 @@ package org.chromium.android_webview.test;
 
 import static org.chromium.android_webview.test.AwActivityTestRule.WAIT_TIMEOUT_MS;
 
+import android.os.Build;
 import android.support.test.InstrumentationRegistry;
 import android.webkit.JavascriptInterface;
 
@@ -22,7 +23,6 @@ import org.junit.runner.RunWith;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwContentsClient.AwWebResourceRequest;
 import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedSslErrorHelper;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.test.EmbeddedTestServer;
@@ -72,7 +72,7 @@ public class AwNetworkConfigurationTest {
             String url = mTestServer.getURL("/android_webview/test/data/hello_world.html");
             mActivityTestRule.loadUrlSync(
                     mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
-            if (BuildInfo.isAtLeastQ()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                 Assert.assertEquals("We should generate an SSL error on >= Q", count + 1,
                         onReceivedSslErrorHelper.getCallCount());
             } else {

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

@@ -12,6 +12,7 @@ import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.support.test.InstrumentationRegistry;
 import android.view.ViewGroup;
 
@@ -41,8 +42,8 @@ import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConversionHelper
 import org.chromium.android_webview.safe_browsing.AwSafeBrowsingResponse;
 import org.chromium.android_webview.test.TestAwContentsClient.OnReceivedError2Helper;
 import org.chromium.android_webview.test.util.GraphicsTestUtils;
-import org.chromium.base.BuildInfo;
 import org.chromium.base.Callback;
+import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.task.PostTask;
 import org.chromium.base.test.util.CallbackHelper;
@@ -508,7 +509,9 @@ public class SafeBrowsingTest {
         Assert.assertEquals(responseUrl, mContentsClient.getLastRequest().url);
         // The expectedCode intentionally depends on targetSdk (and is disconnected from SDK_INT).
         // This is for backwards compatibility with apps with a lower targetSdk.
-        int expectedCode = BuildInfo.targetsAtLeastQ()
+        int expectedCode =
+                ContextUtils.getApplicationContext().getApplicationInfo().targetSdkVersion
+                        >= Build.VERSION_CODES.Q
                 ? AwSafeBrowsingConversionHelper.SAFE_BROWSING_THREAT_BILLING
                 : AwSafeBrowsingConversionHelper.SAFE_BROWSING_THREAT_UNKNOWN;
         Assert.assertEquals(expectedCode, mContentsClient.getLastThreatType());