Android: inline deprecated BuildInfo methods (/components/download)

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

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=shaktisahu@chromium.org

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

components/download/internal/common/android/java/src/org/chromium/components/download/DownloadCollectionBridge.java

@@ -22,7 +22,6 @@ import android.text.format.DateUtils;
 
 import androidx.annotation.NonNull;
 
-import org.chromium.base.BuildInfo;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.StrictModeContext;
@@ -132,7 +131,7 @@ public class DownloadCollectionBridge {
      */
     @CalledByNative
     public static boolean shouldPublishDownload(final String filePath) {
-        if (isAtLeastQ()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             if (filePath == null) return false;
             // Only need to publish downloads that are on primary storage.
             return !sDownloadDelegate.isDownloadOnSDCard(filePath);
@@ -297,7 +296,7 @@ public class DownloadCollectionBridge {
      * @return whether download collection is supported.
      */
     public static boolean supportsDownloadCollection() {
-        return isAtLeastQ();
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q;
     }
 
     /**
@@ -333,10 +332,6 @@ public class DownloadCollectionBridge {
         return DownloadCollectionBridgeJni.get().getExpirationDurationInDays();
     }
 
-    private static boolean isAtLeastQ() {
-        return BuildInfo.isAtLeastQ() || Build.VERSION.SDK_INT >= 29;
-    }
-
     /**
      * Helper method to create a pending session for download to be written into.
      * @param fileName Name of the file.

components/download/internal/common/in_progress_download_manager.cc

@@ -576,7 +576,8 @@ void InProgressDownloadManager::OnDBInitialized(
     std::unique_ptr<std::vector<DownloadDBEntry>> entries) {
 #if defined(OS_ANDROID)
   // Retrieve display names for all downloads from media store if needed.
-  if (base::android::BuildInfo::GetInstance()->is_at_least_q()) {
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >=
+      base::android::SDK_VERSION_Q) {
     DownloadCollectionBridge::GetDisplayNamesCallback callback =
         base::BindOnce(&InProgressDownloadManager::OnDownloadNamesRetrieved,
                        weak_factory_.GetWeakPtr(), std::move(entries));