Use the predefined Android SDK constants instead of numbers

Half the code used the SDK_VERSION_* constants when checking
Android version, half the code used hard coded numbers 19, 21,
22, ....

This changes the code to use SDK_VERSION_ everywhere.

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.android:android_arm64_dbg_recipe;master.tryserver.chromium.android:android_compile_x64_dbg;master.tryserver.chromium.android:android_compile_x86_dbg;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Icb4e3183f0490b00d16039681548ccf469e9d236
Reviewed-on: https://chromium-review.googlesource.com/975841
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545870}

components/crash/content/app/breakpad_linux.cc

@@ -626,7 +626,8 @@ bool FinalizeCrashDoneAndroid(bool is_browser_process) {
   AndroidLogWriteHorizontalRule();
 
   if (!is_browser_process &&
-      android_build_info->sdk_int() >= 18 &&
+      android_build_info->sdk_int() >=
+          base::android::SDK_VERSION_JELLY_BEAN_MR2 &&
       my_strcmp(android_build_info->build_type(), "eng") != 0 &&
       my_strcmp(android_build_info->build_type(), "userdebug") != 0) {
     // On JB MR2 and later, the system crash handler displays a dialog. For

content/renderer/media/renderer_webmediaplayer_delegate.cc

@@ -47,7 +47,8 @@ RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate(
 #if defined(OS_ANDROID)
   // On Android, due to the instability of the OS level media components, we
   // consider all pre-KitKat devices to be potentially buggy.
-  is_jelly_bean_ |= base::android::BuildInfo::GetInstance()->sdk_int() <= 18;
+  is_jelly_bean_ |= base::android::BuildInfo::GetInstance()->sdk_int() <=
+                    base::android::SDK_VERSION_JELLY_BEAN_MR2;
 #endif
 
   idle_cleanup_timer_.SetTaskRunner(

device/usb/usb_device_android.cc

@@ -31,10 +31,12 @@ scoped_refptr<UsbDeviceAndroid> UsbDeviceAndroid::Create(
   ScopedJavaLocalRef<jobject> wrapper =
       Java_ChromeUsbDevice_create(env, usb_device);
   uint16_t device_version = 0;
-  if (base::android::BuildInfo::GetInstance()->sdk_int() >= 23)
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >=
+      base::android::SDK_VERSION_MARSHMALLOW)
     device_version = Java_ChromeUsbDevice_getDeviceVersion(env, wrapper);
   base::string16 manufacturer_string, product_string, serial_number;
-  if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >=
+      base::android::SDK_VERSION_LOLLIPOP) {
     ScopedJavaLocalRef<jstring> manufacturer_jstring =
         Java_ChromeUsbDevice_getManufacturerName(env, wrapper);
     if (!manufacturer_jstring.is_null())
@@ -115,7 +117,8 @@ UsbDeviceAndroid::UsbDeviceAndroid(
       device_id_(Java_ChromeUsbDevice_getDeviceId(env, wrapper)),
       service_(service),
       j_object_(wrapper) {
-  if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >=
+      base::android::SDK_VERSION_LOLLIPOP) {
     ScopedJavaLocalRef<jobjectArray> configurations =
         Java_ChromeUsbDevice_getConfigurations(env, j_object_);
     jsize count = env->GetArrayLength(configurations.obj());

device/usb/usb_interface_android.cc

@@ -20,7 +20,8 @@ UsbInterfaceDescriptor UsbInterfaceAndroid::Convert(
       Java_ChromeUsbInterface_create(env, usb_interface);
 
   uint8_t alternate_setting = 0;
-  if (base::android::BuildInfo::GetInstance()->sdk_int() >= 21) {
+  if (base::android::BuildInfo::GetInstance()->sdk_int() >=
+      base::android::SDK_VERSION_LOLLIPOP) {
     alternate_setting =
         Java_ChromeUsbInterface_getAlternateSetting(env, wrapper);
   }

media/audio/android/audio_manager_android.cc

@@ -337,7 +337,8 @@ AudioParameters AudioManagerAndroid::GetPreferredOutputStreamParameters(
     // AudioManager APIs for GetOptimalOutputFrameSize() don't support channel
     // layouts greater than stereo unless low latency audio is supported.
     if (input_params.channels() <= 2 ||
-        (base::android::BuildInfo::GetInstance()->sdk_int() >= 21 &&
+        (base::android::BuildInfo::GetInstance()->sdk_int() >=
+             base::android::SDK_VERSION_LOLLIPOP &&
          IsAudioLowLatencySupported())) {
       channel_layout = input_params.channel_layout();
     }

media/base/android/media_codec_bridge_impl.cc

@@ -555,7 +555,8 @@ MediaCodecStatus MediaCodecBridgeImpl::GetOutputBufferAddress(
 }
 
 std::string MediaCodecBridgeImpl::GetName() {
-  if (base::android::BuildInfo::GetInstance()->sdk_int() < 18)
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <
+      base::android::SDK_VERSION_JELLY_BEAN_MR2)
     return "";
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> j_name =
@@ -564,7 +565,8 @@ std::string MediaCodecBridgeImpl::GetName() {
 }
 
 bool MediaCodecBridgeImpl::SetSurface(const JavaRef<jobject>& surface) {
-  DCHECK_GE(base::android::BuildInfo::GetInstance()->sdk_int(), 23);
+  DCHECK_GE(base::android::BuildInfo::GetInstance()->sdk_int(),
+            base::android::SDK_VERSION_MARSHMALLOW);
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_setSurface(env, j_bridge_, surface);
 }

media/base/android/media_codec_loop.cc

@@ -4,6 +4,7 @@
 
 #include "media/base/android/media_codec_loop.h"
 
+#include "base/android/build_info.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ -346,7 +347,7 @@ bool MediaCodecLoop::CodecNeedsFlushWorkaround() const {
   // we have to completely destroy and recreate the codec there.
   // TODO(liberato): MediaCodecUtil implements the same function.  We should
   // call that one, except that it doesn't compile outside of android right now.
-  return sdk_int_ < 18;
+  return sdk_int_ < base::android::SDK_VERSION_JELLY_BEAN_MR2;
 }
 
 // static

media/base/android/media_codec_loop.h

@@ -315,7 +315,9 @@ class MEDIA_EXPORT MediaCodecLoop {
   // ownership of it.
   base::TickClock* test_tick_clock_ = nullptr;
 
-  // BuildInfo::sdk_int(), eventually.
+  // Has the value of BuildInfo::sdk_int(), except in tests where it
+  // might be set to other values. Will not be needed when there is a
+  // mockable BuildInfo.
   const int sdk_int_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.

media/base/android/media_codec_loop_unittest.cc

@@ -4,6 +4,7 @@
 
 #include "media/base/android/media_codec_loop.h"
 
+#include "base/android/build_info.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/test/test_mock_time_task_runner.h"
@@ -25,13 +26,6 @@ using ::testing::StrictMock;
 
 namespace media {
 
-// These will come from mockable BuildInfo, once it exists.
-enum TemporaryAndroidVersions {
-  kJellyBeanMR1 = 17,
-  kJellyBeanMR2 = 18,
-  kLollipop = 21,
-};
-
 // The client is a strict mock, since we don't want random calls into it.  We
 // want to be sure about the call sequence.
 class MockMediaCodecLoopClient : public StrictMock<MediaCodecLoop::Client> {
@@ -89,7 +83,7 @@ class MediaCodecLoopTest : public testing::Test {
     mock_task_runner_->FastForwardBy(base::TimeDelta::FromSeconds(30));
   }
 
-  void ConstructCodecLoop(int sdk_int = kLollipop) {
+  void ConstructCodecLoop(int sdk_int = base::android::SDK_VERSION_LOLLIPOP) {
     std::unique_ptr<MediaCodecBridge> codec(new MockMediaCodecBridge());
     // Since we're providing a codec, we do not expect an error.
     EXPECT_CALL(*client_, OnCodecLoopError()).Times(0);
@@ -199,7 +193,7 @@ class MediaCodecLoopTest : public testing::Test {
 TEST_F(MediaCodecLoopTest, TestConstructionWithNullCodec) {
   std::unique_ptr<MediaCodecBridge> codec;
   EXPECT_CALL(*client_, OnCodecLoopError()).Times(1);
-  const int sdk_int = kLollipop;
+  const int sdk_int = base::android::SDK_VERSION_LOLLIPOP;
   codec_loop_.reset(
       new MediaCodecLoop(sdk_int, client_.get(), std::move(codec),
                          scoped_refptr<base::SingleThreadTaskRunner>()));
@@ -416,7 +410,7 @@ TEST_F(MediaCodecLoopTest, TestSeveralPendingIOBuffers) {
 
 TEST_F(MediaCodecLoopTest, TestTryFlushOnJellyBeanMR2) {
   // On JB MR2+ MCL should be willing to use MediaCodecBridge::Flush.
-  ConstructCodecLoop(kJellyBeanMR2);
+  ConstructCodecLoop(base::android::SDK_VERSION_JELLY_BEAN_MR2);
   EXPECT_CALL(Codec(), Flush()).Times(1).WillOnce(Return(MEDIA_CODEC_OK));
   ASSERT_TRUE(codec_loop_->TryFlush());
 }
@@ -424,7 +418,7 @@ TEST_F(MediaCodecLoopTest, TestTryFlushOnJellyBeanMR2) {
 TEST_F(MediaCodecLoopTest, TestTryFlushAfterJellyBeanMR2Fails) {
   // On JB MR2+, MCL should be willing to use MediaCodecBridge::Flush.  Try
   // that, but make Flush fail.
-  ConstructCodecLoop(kJellyBeanMR2);
+  ConstructCodecLoop(base::android::SDK_VERSION_JELLY_BEAN_MR2);
   EXPECT_CALL(Codec(), Flush()).Times(1).WillOnce(Return(MEDIA_CODEC_ERROR));
   EXPECT_CALL(*client_, OnCodecLoopError()).Times(1);
   ASSERT_FALSE(codec_loop_->TryFlush());
@@ -432,7 +426,7 @@ TEST_F(MediaCodecLoopTest, TestTryFlushAfterJellyBeanMR2Fails) {
 
 TEST_F(MediaCodecLoopTest, TestTryFlushOnJellyBeanMR1) {
   // In JB MR1, MCL should not be willing to use MediaCodecBridge::Flush.
-  ConstructCodecLoop(kJellyBeanMR1);
+  ConstructCodecLoop(base::android::SDK_VERSION_JELLY_BEAN_MR1);
   ASSERT_FALSE(codec_loop_->TryFlush());
 }
 

media/base/android/media_codec_util.cc

@@ -30,6 +30,7 @@ using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 using base::android::SDK_VERSION_JELLY_BEAN_MR2;
 using base::android::SDK_VERSION_KITKAT;
+using base::android::SDK_VERSION_LOLLIPOP;
 using base::android::SDK_VERSION_LOLLIPOP_MR1;
 
 namespace media {
@@ -198,8 +199,9 @@ bool MediaCodecUtil::IsMediaCodecAvailableFor(int sdk, const char* model) {
 
 // static
 bool MediaCodecUtil::SupportsSetParameters() {
-  // MediaCodec.setParameters() is only available starting with K.
-  return base::android::BuildInfo::GetInstance()->sdk_int() >= 19;
+  // MediaCodec.setParameters() is only available starting with KitKat.
+  return base::android::BuildInfo::GetInstance()->sdk_int() >=
+         SDK_VERSION_KITKAT;
 }
 
 // static
@@ -292,7 +294,8 @@ bool MediaCodecUtil::IsKnownUnaccelerated(VideoCodec codec,
       return true;
 
     if (codec == kCodecVP9)
-      return base::android::BuildInfo::GetInstance()->sdk_int() < 21;
+      return base::android::BuildInfo::GetInstance()->sdk_int() <
+             SDK_VERSION_LOLLIPOP;
 
     return false;
   }

media/base/android/media_drm_bridge.cc

@@ -250,7 +250,8 @@ std::string GetSecurityLevelString(
 }
 
 bool AreMediaDrmApisAvailable() {
-  if (base::android::BuildInfo::GetInstance()->sdk_int() < 19)
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <
+      base::android::SDK_VERSION_KITKAT)
     return false;
 
   int32_t os_major_version = 0;
@@ -268,7 +269,8 @@ bool IsPersistentLicenseTypeSupportedByMediaDrm() {
   return MediaDrmBridge::IsAvailable() &&
          // In development. See http://crbug.com/493521
          base::FeatureList::IsEnabled(kMediaDrmPersistentLicense) &&
-         base::android::BuildInfo::GetInstance()->sdk_int() >= 23;
+         base::android::BuildInfo::GetInstance()->sdk_int() >=
+             base::android::SDK_VERSION_MARSHMALLOW;
 }
 
 // Callback for MediaDrmStorageBridge::Initialize.
@@ -891,8 +893,9 @@ MediaDrmBridge::MediaDrmBridge(
       // TODO(yucliu): Remove the check once persistent storage is fully
       // supported and check if origin is valid.
       base::FeatureList::IsEnabled(kMediaDrmPersistentLicense) &&
-      // MediaDrm implements origin isolated storage on M.
-      base::android::BuildInfo::GetInstance()->sdk_int() >= 23 &&
+      // MediaDrm implements origin isolated storage on Marshmallow.
+      base::android::BuildInfo::GetInstance()->sdk_int() >=
+          base::android::SDK_VERSION_MARSHMALLOW &&
       // origin id can be empty when MediaDrmBridge is created by
       // CreateWithoutSessionSupport, which is used to reset credentials.
       !origin_id.empty();

media/base/android/media_drm_bridge_unittest.cc

@@ -69,7 +69,8 @@ TEST(MediaDrmBridgeTest, IsKeySystemSupported_Widevine) {
   EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(
       IsKeySystemSupportedWithType(kWidevineKeySystem, kVideoMp4));
 
-  if (base::android::BuildInfo::GetInstance()->sdk_int() <= 19) {
+  if (base::android::BuildInfo::GetInstance()->sdk_int() <=
+      base::android::SDK_VERSION_KITKAT) {
     EXPECT_FALSE(IsKeySystemSupportedWithType(kWidevineKeySystem, kAudioWebM));
     EXPECT_FALSE(IsKeySystemSupportedWithType(kWidevineKeySystem, kVideoWebM));
   } else {

media/base/media.cc

@@ -92,7 +92,8 @@ bool HasPlatformDecoderSupport() {
 }
 
 bool PlatformHasOpusSupport() {
-  return base::android::BuildInfo::GetInstance()->sdk_int() >= 21;
+  return base::android::BuildInfo::GetInstance()->sdk_int() >=
+         base::android::SDK_VERSION_LOLLIPOP;
 }
 #endif  // defined(OS_ANDROID)
 

media/base/mime_util_internal.cc

@@ -601,7 +601,8 @@ bool MimeUtil::IsCodecSupportedOnAndroid(
 #if defined(OS_ANDROID)
       // HEVC/H.265 is supported in Lollipop+ (API Level 21), according to
       // http://developer.android.com/reference/android/media/MediaFormat.html
-      return base::android::BuildInfo::GetInstance()->sdk_int() >= 21;
+      return base::android::BuildInfo::GetInstance()->sdk_int() >=
+             base::android::SDK_VERSION_LOLLIPOP;
 #else
       return true;
 #endif  // defined(OS_ANDROID)

media/base/mime_util_unittest.cc

@@ -126,7 +126,8 @@ static MimeUtil::PlatformInfo VaryAllFields() {
 static bool HasHevcSupport() {
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
 #if defined(OS_ANDROID)
-  return base::android::BuildInfo::GetInstance()->sdk_int() >= 21;
+  return base::android::BuildInfo::GetInstance()->sdk_int() >=
+         base::android::SDK_VERSION_LOLLIPOP;
 #else
   return true;
 #endif  // defined(OS_ANDROID)

media/filters/audio_decoder_unittest.cc

@@ -157,7 +157,8 @@ class AudioDecoderTest
         return false;
       }
       if (params_.codec == kCodecOpus &&
-          base::android::BuildInfo::GetInstance()->sdk_int() < 21) {
+          base::android::BuildInfo::GetInstance()->sdk_int() <
+              base::android::SDK_VERSION_LOLLIPOP) {
         VLOG(0) << "Could not run test - Opus is not supported";
         return false;
       }
@@ -332,7 +333,8 @@ class AudioDecoderTest
   // for AAC before Android L. Skip the timestamp check in this situation.
   bool SkipBufferTimestampCheck() const {
 #if defined(OS_ANDROID)
-    return (base::android::BuildInfo::GetInstance()->sdk_int() < 21) &&
+    return (base::android::BuildInfo::GetInstance()->sdk_int() <
+            base::android::SDK_VERSION_LOLLIPOP) &&
            decoder_type_ == MEDIA_CODEC && params_.codec == kCodecAAC;
 #else
     return false;

net/cert/cert_verify_proc_unittest.cc

@@ -236,10 +236,12 @@ class CertVerifyProcInternalTest
 
   bool SupportsReturningVerifiedChain() const {
 #if defined(OS_ANDROID)
-    // Before API level 17, Android does not expose the APIs necessary to get at
-    // the verified certificate chain.
+    // Before API level 17 (SDK_VERSION_JELLY_BEAN_MR1), Android does
+    // not expose the APIs necessary to get at the verified
+    // certificate chain.
     if (verify_proc_type() == CERT_VERIFY_PROC_ANDROID &&
-        base::android::BuildInfo::GetInstance()->sdk_int() < 17)
+        base::android::BuildInfo::GetInstance()->sdk_int() <
+            base::android::SDK_VERSION_JELLY_BEAN_MR1)
       return false;
 #endif
     return true;
@@ -247,10 +249,12 @@ class CertVerifyProcInternalTest
 
   bool SupportsDetectingKnownRoots() const {
 #if defined(OS_ANDROID)
-    // Before API level 17, Android does not expose the APIs necessary to get at
-    // the verified certificate chain and detect known roots.
+    // Before API level 17 (SDK_VERSION_JELLY_BEAN_MR1), Android does not expose
+    // the APIs necessary to get at the verified certificate chain and detect
+    // known roots.
     if (verify_proc_type() == CERT_VERIFY_PROC_ANDROID)
-      return base::android::BuildInfo::GetInstance()->sdk_int() >= 17;
+      return base::android::BuildInfo::GetInstance()->sdk_int() >=
+             base::android::SDK_VERSION_JELLY_BEAN_MR1;
 #endif
 
     // iOS does not expose the APIs necessary to get the known system roots.

net/ssl/ssl_platform_key_android.cc

@@ -194,12 +194,12 @@ scoped_refptr<SSLPrivateKey> WrapJavaPrivateKey(
 
   android::AndroidRSA* sys_rsa = nullptr;
   if (type == EVP_PKEY_RSA) {
-    const int kAndroid42ApiLevel = 17;
     if (base::android::BuildInfo::GetInstance()->sdk_int() <
-        kAndroid42ApiLevel) {
-      // Route around platform limitations: if Android < 4.2, then
-      // base::android::RawSignDigestWithPrivateKey() cannot work, so try to get
-      // the system OpenSSL's EVP_PKEY backing this PrivateKey object.
+        base::android::SDK_VERSION_JELLY_BEAN_MR1) {
+      // Route around platform limitations: if Android < 4.2 (Jelly
+      // Bean MR1), then base::android::RawSignDigestWithPrivateKey()
+      // cannot work, so try to get the system OpenSSL's EVP_PKEY
+      // backing this PrivateKey object.
       android::AndroidEVP_PKEY* sys_pkey =
           android::GetOpenSSLSystemHandleForPrivateKey(key);
       if (!sys_pkey)

sandbox/linux/seccomp-bpf-helpers/seccomp_starter_android.cc

@@ -10,6 +10,7 @@
 #include "base/logging.h"
 
 #if BUILDFLAG(USE_SECCOMP_BPF)
+#include "base/android/build_info.h"
 #include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
 #endif
 
@@ -42,7 +43,7 @@ bool SeccompStarterAndroid::StartSandbox() {
     // apps. It has its own SIGSYS handler that must be un-hooked so that
     // the Chromium one can be used instead. If pre-O devices have a SIGSYS
     // handler, then warn about that.
-    DLOG_IF(WARNING, sdk_int_ < 26)
+    DLOG_IF(WARNING, sdk_int_ < base::android::SDK_VERSION_OREO)
         << "Un-hooking existing SIGSYS handler before starting "
         << "Seccomp sandbox";
   }
@@ -58,11 +59,11 @@ bool SeccompStarterAndroid::StartSandbox() {
 
 bool SeccompStarterAndroid::IsSupportedBySDK() const {
 #if BUILDFLAG(USE_SECCOMP_BPF)
-  if (sdk_int_ < 22) {
+  if (sdk_int_ < base::android::SDK_VERSION_LOLLIPOP_MR1) {
     // Seccomp was never available pre-Lollipop.
     return false;
   }
-  if (sdk_int_ > 22) {
+  if (sdk_int_ > base::android::SDK_VERSION_LOLLIPOP_MR1) {
     // On Marshmallow and higher, Seccomp is required by CTS.
     return true;
   }