Android: tidy up outdated version checks.

base/android/java/src/org/chromium/base/CommandLineInitUtil.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings;
@@ skipping 57 matching lines @@
     @SuppressFBWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
     private static File getAlternativeCommandLinePath(Context context, String fileName) {
         File alternativeCommandLineFile =
                 new File(COMMAND_LINE_FILE_PATH_DEBUG_APP, fileName);
         if (!alternativeCommandLineFile.exists()) return null;
         try {
             if (BuildInfo.isDebugAndroid()) {
                 return alternativeCommandLineFile;
             }
 
-            String debugApp = Build.VERSION.SDK_INT < 17
-                    ? getDebugAppPreJBMR1(context) : getDebugAppJBMR1(context);
+            String debugApp = Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1
+                    ? getDebugAppPreJBMR1(context)
+                    : getDebugAppJBMR1(context);
 
             if (debugApp != null
                     && debugApp.equals(context.getApplicationContext().getPackageName())) {
                 return alternativeCommandLineFile;
             }
         } catch (RuntimeException e) {
             Log.e(TAG, "Unable to detect alternative command line file");
         }
 
         return null;
@@ skipping 14 matching lines @@
     private static String getDebugAppPreJBMR1(Context context) {
         boolean adbEnabled = Settings.System.getInt(context.getContentResolver(),
                 Settings.System.ADB_ENABLED, 0) == 1;
         if (adbEnabled) {
             return Settings.System.getString(context.getContentResolver(),
                     Settings.System.DEBUG_APP);
         }
         return null;
     }
 }