Remove KitKat-only code from //content

Bug: 1041930
Change-Id: If407bc3418dbf0759d248baa7cdd7d4a3b6844a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297704
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788890}

content/browser/accessibility/web_contents_accessibility_android.cc

@@ -808,7 +808,7 @@ jboolean WebContentsAccessibilityAndroid::PopulateAccessibilityNodeInfo(
 
   UpdateAccessibilityNodeInfoBoundsRect(env, obj, info, unique_id, node);
 
-  Java_WebContentsAccessibilityImpl_setAccessibilityNodeInfoLollipopAttributes(
+  Java_WebContentsAccessibilityImpl_setAccessibilityNodeInfoAttributes(
       env, obj, info, node->CanOpenPopup(), node->IsContentInvalid(),
       node->IsDismissable(), node->IsMultiLine(), node->AndroidInputType(),
       node->AndroidLiveRegionType(),
@@ -894,30 +894,6 @@ jboolean WebContentsAccessibilityAndroid::PopulateAccessibilityEvent(
       break;
   }
 
-  Java_WebContentsAccessibilityImpl_setAccessibilityEventLollipopAttributes(
-      env, obj, event, node->CanOpenPopup(), node->IsContentInvalid(),
-      node->IsDismissable(), node->IsMultiLine(), node->AndroidInputType(),
-      node->AndroidLiveRegionType());
-  if (node->IsCollection()) {
-    Java_WebContentsAccessibilityImpl_setAccessibilityEventCollectionInfo(
-        env, obj, event, node->RowCount(), node->ColumnCount(),
-        node->IsHierarchical());
-  }
-  if (node->IsHeading()) {
-    Java_WebContentsAccessibilityImpl_setAccessibilityEventHeadingFlag(
-        env, obj, event, true);
-  }
-  if (node->IsCollectionItem()) {
-    Java_WebContentsAccessibilityImpl_setAccessibilityEventCollectionItemInfo(
-        env, obj, event, node->RowIndex(), node->RowSpan(), node->ColumnIndex(),
-        node->ColumnSpan());
-  }
-  if (node->IsRangeType()) {
-    Java_WebContentsAccessibilityImpl_setAccessibilityEventRangeInfo(
-        env, obj, event, node->AndroidRangeType(), node->RangeMin(),
-        node->RangeMax(), node->RangeCurrentValue());
-  }
-
   return true;
 }
 

content/public/android/BUILD.gn

@@ -166,7 +166,6 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/JavascriptInterface.java",
     "java/src/org/chromium/content/browser/JoystickHandler.java",
     "java/src/org/chromium/content/browser/LauncherThread.java",
-    "java/src/org/chromium/content/browser/LollipopTtsPlatformImpl.java",
     "java/src/org/chromium/content/browser/MediaSessionImpl.java",
     "java/src/org/chromium/content/browser/MotionEventSynthesizerImpl.java",
     "java/src/org/chromium/content/browser/NfcHost.java",
@@ -186,16 +185,13 @@ android_library("content_java") {
     "java/src/org/chromium/content/browser/WindowEventObserverManager.java",
     "java/src/org/chromium/content/browser/accessibility/AccessibilityEventDispatcher.java",
     "java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityState.java",
-    "java/src/org/chromium/content/browser/accessibility/LollipopWebContentsAccessibility.java",
     "java/src/org/chromium/content/browser/accessibility/OWebContentsAccessibility.java",
     "java/src/org/chromium/content/browser/accessibility/PieWebContentsAccessibility.java",
     "java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java",
-    "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridgeFactory.java",
+    "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridge.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningController.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningStyle.java",
-    "java/src/org/chromium/content/browser/accessibility/captioning/EmptyCaptioningBridge.java",
-    "java/src/org/chromium/content/browser/accessibility/captioning/KitKatCaptioningBridge.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/SystemCaptioningBridge.java",
     "java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java",
     "java/src/org/chromium/content/browser/androidoverlay/AndroidOverlayProviderImpl.java",

content/public/android/java/src/org/chromium/content/browser/LollipopTtsPlatformImpl.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.content.browser;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.os.Bundle;
-import android.speech.tts.TextToSpeech;
-import android.speech.tts.UtteranceProgressListener;
-
-import org.chromium.base.annotations.JNINamespace;
-
-/**
- * Subclass of TtsPlatformImpl for Lollipop to make use of newer APIs.
- */
-@JNINamespace("content")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-class LollipopTtsPlatformImpl extends TtsPlatformImpl {
-    protected LollipopTtsPlatformImpl(long nativeTtsPlatformImplAndroid) {
-        super(nativeTtsPlatformImplAndroid);
-    }
-
-    /**
-     * Overrides TtsPlatformImpl because the API changed in Lollipop.
-     */
-    @Override
-    protected void addOnUtteranceProgressListener() {
-        mTextToSpeech.setOnUtteranceProgressListener(new UtteranceProgressListener() {
-            @Override
-            public void onDone(final String utteranceId) {
-                sendEndEventOnUiThread(utteranceId);
-            }
-
-            @Override
-            public void onError(final String utteranceId, int errorCode) {
-                sendErrorEventOnUiThread(utteranceId);
-            }
-
-            @Override
-            @Deprecated
-            public void onError(final String utteranceId) {}
-
-            @Override
-            public void onStart(final String utteranceId) {
-                sendStartEventOnUiThread(utteranceId);
-            }
-        });
-    }
-
-    /**
-     * Overrides TtsPlatformImpl because the API changed in Lollipop.
-     */
-    @Override
-    protected int callSpeak(String text, float volume, int utteranceId) {
-        Bundle params = new Bundle();
-        if (volume != 1.0) {
-            params.putFloat(TextToSpeech.Engine.KEY_PARAM_VOLUME, volume);
-        }
-        return mTextToSpeech.speak(
-                text, TextToSpeech.QUEUE_FLUSH, params, Integer.toString(utteranceId));
-    }
-}

content/public/android/java/src/org/chromium/content/browser/TtsPlatformImpl.java

@@ -4,7 +4,7 @@
 
 package org.chromium.content.browser;
 
-import android.os.Build;
+import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
 
@@ -18,7 +18,6 @@ import org.chromium.base.task.PostTask;
 import org.chromium.content_public.browser.UiThreadTaskTraits;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 
@@ -68,13 +67,13 @@ class TtsPlatformImpl {
     }
 
     private long mNativeTtsPlatformImplAndroid;
-    protected final TextToSpeech mTextToSpeech;
+    private final TextToSpeech mTextToSpeech;
     private boolean mInitialized;
     private List<TtsVoice> mVoices;
     private String mCurrentLanguage;
     private PendingUtterance mPendingUtterance;
 
-    protected TtsPlatformImpl(long nativeTtsPlatformImplAndroid) {
+    private TtsPlatformImpl(long nativeTtsPlatformImplAndroid) {
         mInitialized = false;
         mNativeTtsPlatformImplAndroid = nativeTtsPlatformImplAndroid;
         mTextToSpeech = new TextToSpeech(ContextUtils.getApplicationContext(), status -> {
@@ -93,11 +92,7 @@ class TtsPlatformImpl {
      */
     @CalledByNative
     private static TtsPlatformImpl create(long nativeTtsPlatformImplAndroid) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            return new LollipopTtsPlatformImpl(nativeTtsPlatformImplAndroid);
-        } else {
-            return new TtsPlatformImpl(nativeTtsPlatformImplAndroid);
-        }
+        return new TtsPlatformImpl(nativeTtsPlatformImplAndroid);
     }
 
     /**
@@ -192,7 +187,7 @@ class TtsPlatformImpl {
     /**
      * Post a task to the UI thread to send the TTS "end" event.
      */
-    protected void sendEndEventOnUiThread(final String utteranceId) {
+    private void sendEndEventOnUiThread(final String utteranceId) {
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
             if (mNativeTtsPlatformImplAndroid != 0) {
                 TtsPlatformImplJni.get().onEndEvent(
@@ -204,7 +199,7 @@ class TtsPlatformImpl {
     /**
      * Post a task to the UI thread to send the TTS "error" event.
      */
-    protected void sendErrorEventOnUiThread(final String utteranceId) {
+    private void sendErrorEventOnUiThread(final String utteranceId) {
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
             if (mNativeTtsPlatformImplAndroid != 0) {
                 TtsPlatformImplJni.get().onErrorEvent(
@@ -216,7 +211,7 @@ class TtsPlatformImpl {
     /**
      * Post a task to the UI thread to send the TTS "start" event.
      */
-    protected void sendStartEventOnUiThread(final String utteranceId) {
+    private void sendStartEventOnUiThread(final String utteranceId) {
         PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> {
             if (mNativeTtsPlatformImplAndroid != 0) {
                 TtsPlatformImplJni.get().onStartEvent(
@@ -225,25 +220,23 @@ class TtsPlatformImpl {
         });
     }
 
-    /**
-     * This is overridden by LollipopTtsPlatformImpl because the API changed.
-     */
     @SuppressWarnings("deprecation")
-    protected void addOnUtteranceProgressListener() {
+    private void addOnUtteranceProgressListener() {
         mTextToSpeech.setOnUtteranceProgressListener(new UtteranceProgressListener() {
             @Override
             public void onDone(final String utteranceId) {
                 sendEndEventOnUiThread(utteranceId);
             }
 
-            // This is deprecated in Lollipop and higher but we still need to catch it
-            // on pre-Lollipop builds.
             @Override
-            @SuppressWarnings("deprecation")
-            public void onError(final String utteranceId) {
+            public void onError(final String utteranceId, int errorCode) {
                 sendErrorEventOnUiThread(utteranceId);
             }
 
+            @Override
+            @Deprecated
+            public void onError(final String utteranceId) {}
+
             @Override
             public void onStart(final String utteranceId) {
                 sendStartEventOnUiThread(utteranceId);
@@ -251,17 +244,14 @@ class TtsPlatformImpl {
         });
     }
 
-    /**
-     * This is overridden by LollipopTtsPlatformImpl because the API changed.
-     */
     @SuppressWarnings("deprecation")
-    protected int callSpeak(String text, float volume, int utteranceId) {
-        HashMap<String, String> params = new HashMap<String, String>();
+    private int callSpeak(String text, float volume, int utteranceId) {
+        Bundle params = new Bundle();
         if (volume != 1.0) {
-            params.put(TextToSpeech.Engine.KEY_PARAM_VOLUME, Double.toString(volume));
+            params.putFloat(TextToSpeech.Engine.KEY_PARAM_VOLUME, volume);
         }
-        params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, Integer.toString(utteranceId));
-        return mTextToSpeech.speak(text, TextToSpeech.QUEUE_FLUSH, params);
+        return mTextToSpeech.speak(
+                text, TextToSpeech.QUEUE_FLUSH, params, Integer.toString(utteranceId));
     }
 
     /**

content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopWebContentsAccessibility.java

-// Copyright 2017 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.content.browser.accessibility;
-
-import android.annotation.TargetApi;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ReceiverCallNotAllowedException;
-import android.os.Build;
-import android.text.SpannableString;
-import android.text.style.LocaleSpan;
-import android.text.style.SuggestionSpan;
-import android.util.SparseArray;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
-
-import org.chromium.base.ContextUtils;
-import org.chromium.base.annotations.JNINamespace;
-import org.chromium.content_public.browser.WebContents;
-
-import java.util.Locale;
-
-/**
- * Subclass of WebContentsAccessibility for Lollipop.
- */
-@JNINamespace("content")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-public class LollipopWebContentsAccessibility extends WebContentsAccessibilityImpl {
-    private static SparseArray<AccessibilityAction> sAccessibilityActionMap =
-            new SparseArray<AccessibilityAction>();
-    private String mSystemLanguageTag;
-    private BroadcastReceiver mBroadcastReceiver;
-
-    LollipopWebContentsAccessibility(WebContents webContents) {
-        super(webContents);
-    }
-
-    @Override
-    protected void onNativeInit() {
-        super.onNativeInit();
-        mBroadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                mSystemLanguageTag = Locale.getDefault().toLanguageTag();
-            }
-        };
-
-        // Register a broadcast receiver for locale change for Lollipop or higher version.
-        if (mView.isAttachedToWindow()) registerLocaleChangeReceiver();
-    }
-
-    @Override
-    protected void setAccessibilityNodeInfoLollipopAttributes(AccessibilityNodeInfo node,
-            boolean canOpenPopup, boolean contentInvalid, boolean dismissable, boolean multiLine,
-            int inputType, int liveRegion, String errorMessage) {
-        node.setCanOpenPopup(canOpenPopup);
-        node.setContentInvalid(contentInvalid);
-        node.setDismissable(contentInvalid);
-        node.setMultiLine(multiLine);
-        node.setInputType(inputType);
-        node.setLiveRegion(liveRegion);
-        node.setError(errorMessage);
-    }
-
-    @Override
-    protected void setAccessibilityNodeInfoCollectionInfo(
-            AccessibilityNodeInfo node, int rowCount, int columnCount, boolean hierarchical) {
-        node.setCollectionInfo(
-                AccessibilityNodeInfo.CollectionInfo.obtain(rowCount, columnCount, hierarchical));
-    }
-
-    @Override
-    protected void setAccessibilityNodeInfoCollectionItemInfo(AccessibilityNodeInfo node,
-            int rowIndex, int rowSpan, int columnIndex, int columnSpan, boolean heading) {
-        node.setCollectionItemInfo(AccessibilityNodeInfo.CollectionItemInfo.obtain(
-                rowIndex, rowSpan, columnIndex, columnSpan, heading));
-    }
-
-    @Override
-    protected void setAccessibilityNodeInfoRangeInfo(
-            AccessibilityNodeInfo node, int rangeType, float min, float max, float current) {
-        node.setRangeInfo(AccessibilityNodeInfo.RangeInfo.obtain(rangeType, min, max, current));
-    }
-
-    @Override
-    protected void setAccessibilityNodeInfoViewIdResourceName(
-            AccessibilityNodeInfo node, String viewIdResourceName) {
-        node.setViewIdResourceName(viewIdResourceName);
-    }
-
-    @Override
-    protected void setAccessibilityEventLollipopAttributes(AccessibilityEvent event,
-            boolean canOpenPopup, boolean contentInvalid, boolean dismissable, boolean multiLine,
-            int inputType, int liveRegion) {
-        // This is just a fallback for pre-Lollipop systems.
-        // Do nothing on Lollipop and higher.
-    }
-
-    @Override
-    protected void setAccessibilityEventCollectionInfo(
-            AccessibilityEvent event, int rowCount, int columnCount, boolean hierarchical) {
-        // This is just a fallback for pre-Lollipop systems.
-        // Do nothing on Lollipop and higher.
-    }
-
-    @Override
-    protected void setAccessibilityEventHeadingFlag(AccessibilityEvent event, boolean heading) {
-        // This is just a fallback for pre-Lollipop systems.
-        // Do nothing on Lollipop and higher.
-    }
-
-    @Override
-    protected void setAccessibilityEventCollectionItemInfo(
-            AccessibilityEvent event, int rowIndex, int rowSpan, int columnIndex, int columnSpan) {
-        // This is just a fallback for pre-Lollipop systems.
-        // Do nothing on Lollipop and higher.
-    }
-
-    @Override
-    protected void setAccessibilityEventRangeInfo(
-            AccessibilityEvent event, int rangeType, float min, float max, float current) {
-        // This is just a fallback for pre-Lollipop systems.
-        // Do nothing on Lollipop and higher.
-    }
-
-    @Override
-    protected void addAction(AccessibilityNodeInfo node, int actionId) {
-        // The Lollipop SDK requires us to call AccessibilityNodeInfo.addAction with an
-        // AccessibilityAction argument, but to simplify things and share more code with
-        // the pre-L SDK, we just cache a set of AccessibilityActions mapped by their ID.
-        AccessibilityAction action = sAccessibilityActionMap.get(actionId);
-        if (action == null) {
-            action = new AccessibilityAction(actionId, null);
-            sAccessibilityActionMap.put(actionId, action);
-        }
-        node.addAction(action);
-    }
-
-    @Override
-    protected CharSequence computeText(String text, boolean annotateAsLink, String language,
-            int[] suggestionStarts, int[] suggestionEnds, String[] suggestions) {
-        CharSequence charSequence = super.computeText(
-                text, annotateAsLink, language, suggestionStarts, suggestionEnds, suggestions);
-        if (!language.isEmpty() && !language.equals(mSystemLanguageTag)) {
-            SpannableString spannable;
-            if (charSequence instanceof SpannableString) {
-                spannable = (SpannableString) charSequence;
-            } else {
-                spannable = new SpannableString(charSequence);
-            }
-            Locale locale = Locale.forLanguageTag(language);
-            spannable.setSpan(new LocaleSpan(locale), 0, spannable.length(), 0);
-            charSequence = spannable;
-        }
-
-        if (suggestionStarts != null && suggestionStarts.length > 0) {
-            assert suggestionEnds != null;
-            assert suggestionEnds.length == suggestionStarts.length;
-            assert suggestions != null;
-            assert suggestions.length == suggestionStarts.length;
-
-            SpannableString spannable;
-            if (charSequence instanceof SpannableString) {
-                spannable = (SpannableString) charSequence;
-            } else {
-                spannable = new SpannableString(charSequence);
-            }
-
-            int spannableLen = spannable.length();
-            for (int i = 0; i < suggestionStarts.length; i++) {
-                int start = suggestionStarts[i];
-                int end = suggestionEnds[i];
-                // Ignore any spans outside the range of the spannable string.
-                if (start < 0 || start > spannableLen || end < 0 || end > spannableLen
-                        || start > end) {
-                    continue;
-                }
-
-                String[] suggestionArray = new String[1];
-                suggestionArray[0] = suggestions[i];
-                int flags = SuggestionSpan.FLAG_MISSPELLED;
-                SuggestionSpan suggestionSpan =
-                        new SuggestionSpan(mContext, suggestionArray, flags);
-                spannable.setSpan(suggestionSpan, start, end, 0);
-            }
-            charSequence = spannable;
-        }
-
-        return charSequence;
-    }
-
-    @Override
-    public void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (!isNativeInitialized()) return;
-        ContextUtils.getApplicationContext().unregisterReceiver(mBroadcastReceiver);
-    }
-
-    @Override
-    public void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        registerLocaleChangeReceiver();
-    }
-
-    private void registerLocaleChangeReceiver() {
-        if (!isNativeInitialized()) return;
-        try {
-            IntentFilter filter = new IntentFilter(Intent.ACTION_LOCALE_CHANGED);
-            ContextUtils.getApplicationContext().registerReceiver(mBroadcastReceiver, filter);
-        } catch (ReceiverCallNotAllowedException e) {
-            // WebView may be running inside a BroadcastReceiver, in which case registerReceiver is
-            // not allowed.
-        }
-        mSystemLanguageTag = Locale.getDefault().toLanguageTag();
-    }
-}

content/public/android/java/src/org/chromium/content/browser/accessibility/OWebContentsAccessibility.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
  */
 @JNINamespace("content")
 @TargetApi(Build.VERSION_CODES.O)
-public class OWebContentsAccessibility extends LollipopWebContentsAccessibility {
+public class OWebContentsAccessibility extends WebContentsAccessibilityImpl {
     OWebContentsAccessibility(WebContents webContents) {
         super(webContents);
     }

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/KitKatCaptioningBridge.java → content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridge.java

@@ -4,9 +4,7 @@
 
 package org.chromium.content.browser.accessibility.captioning;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.view.accessibility.CaptioningManager;
 
 import org.chromium.base.ContextUtils;
@@ -14,67 +12,47 @@ import org.chromium.base.ContextUtils;
 import java.util.Locale;
 
 /**
- * This is the implementation of SystemCaptioningBridge that uses CaptioningManager
- * on KitKat+ systems.
+ * Implementation of SystemCaptioningBridge that uses CaptioningManager.
  */
-@TargetApi(Build.VERSION_CODES.KITKAT)
-public class KitKatCaptioningBridge implements SystemCaptioningBridge {
-    private final CaptioningManager.CaptioningChangeListener mCaptioningChangeListener =
-            new KitKatCaptioningChangeListener();
-
+public class CaptioningBridge
+        extends CaptioningManager.CaptioningChangeListener implements SystemCaptioningBridge {
     private final CaptioningChangeDelegate mCaptioningChangeDelegate;
     private final CaptioningManager mCaptioningManager;
-    private static KitKatCaptioningBridge sKitKatCaptioningBridge;
+    private static CaptioningBridge sInstance;
 
-    /**
-     * Bridge listener to inform the mCaptioningChangeDelegate when the mCaptioningManager
-     * broadcasts any changes.
-     */
-    private class KitKatCaptioningChangeListener extends
-            CaptioningManager.CaptioningChangeListener {
-        @Override
-        public void onEnabledChanged(boolean enabled) {
-            mCaptioningChangeDelegate.onEnabledChanged(enabled);
+    public static CaptioningBridge getInstance() {
+        if (sInstance == null) {
+            sInstance = new CaptioningBridge();
         }
+        return sInstance;
+    }
 
-        @Override
-        public void onFontScaleChanged(float fontScale) {
-            mCaptioningChangeDelegate.onFontScaleChanged(fontScale);
-        }
+    private CaptioningBridge() {
+        mCaptioningChangeDelegate = new CaptioningChangeDelegate();
+        mCaptioningManager =
+                (CaptioningManager) ContextUtils.getApplicationContext().getSystemService(
+                        Context.CAPTIONING_SERVICE);
+    }
 
-        @Override
-        public void onLocaleChanged(Locale locale) {
-            mCaptioningChangeDelegate.onLocaleChanged(locale);
-        }
+    @Override
+    public void onEnabledChanged(boolean enabled) {
+        mCaptioningChangeDelegate.onEnabledChanged(enabled);
+    }
 
-        @Override
-        public void onUserStyleChanged(CaptioningManager.CaptionStyle userStyle) {
-            final CaptioningStyle captioningStyle = getCaptioningStyleFrom(userStyle);
-            mCaptioningChangeDelegate.onUserStyleChanged(captioningStyle);
-        }
+    @Override
+    public void onFontScaleChanged(float fontScale) {
+        mCaptioningChangeDelegate.onFontScaleChanged(fontScale);
     }
 
-    /**
-     * Return the singleton instance of the captioning bridge for Kitkat+
-     *
-     * @param context the Context to associate with this bridge.
-     * @return the singleton instance of KitKatCaptioningBridge.
-     */
-    public static KitKatCaptioningBridge getInstance() {
-        if (sKitKatCaptioningBridge == null) {
-            sKitKatCaptioningBridge = new KitKatCaptioningBridge();
-        }
-        return sKitKatCaptioningBridge;
+    @Override
+    public void onLocaleChanged(Locale locale) {
+        mCaptioningChangeDelegate.onLocaleChanged(locale);
     }
 
-    /**
-     * Construct a new KitKat+ captioning bridge
-     */
-    private KitKatCaptioningBridge() {
-        mCaptioningChangeDelegate = new CaptioningChangeDelegate();
-        mCaptioningManager =
-                (CaptioningManager) ContextUtils.getApplicationContext().getSystemService(
-                        Context.CAPTIONING_SERVICE);
+    @Override
+    public void onUserStyleChanged(CaptioningManager.CaptionStyle userStyle) {
+        final CaptioningStyle captioningStyle = getCaptioningStyleFrom(userStyle);
+        mCaptioningChangeDelegate.onUserStyleChanged(captioningStyle);
     }
 
     /**
@@ -99,7 +77,7 @@ public class KitKatCaptioningBridge implements SystemCaptioningBridge {
     @Override
     public void addListener(SystemCaptioningBridge.SystemCaptioningBridgeListener listener) {
         if (!mCaptioningChangeDelegate.hasActiveListener()) {
-            mCaptioningManager.addCaptioningChangeListener(mCaptioningChangeListener);
+            mCaptioningManager.addCaptioningChangeListener(this);
             syncToDelegate();
         }
         mCaptioningChangeDelegate.addListener(listener);
@@ -110,7 +88,7 @@ public class KitKatCaptioningBridge implements SystemCaptioningBridge {
     public void removeListener(SystemCaptioningBridge.SystemCaptioningBridgeListener listener) {
         mCaptioningChangeDelegate.removeListener(listener);
         if (!mCaptioningChangeDelegate.hasActiveListener()) {
-            mCaptioningManager.removeCaptioningChangeListener(mCaptioningChangeListener);
+            mCaptioningManager.removeCaptioningChangeListener(this);
         }
     }
 

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridgeFactory.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.content.browser.accessibility.captioning;
-
-import android.os.Build;
-
-/**
- * Returns the best captions bridge available.  If the API level is lower than KitKat, a no-op
- * bridge is returned since those systems didn't support this functionality.
- */
-public class CaptioningBridgeFactory {
-    /**
-     * Create and return the best SystemCaptioningBridge available.
-     *
-     * @return the best SystemCaptioningBridge available.
-     */
-    public static SystemCaptioningBridge getSystemCaptioningBridge() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            return KitKatCaptioningBridge.getInstance();
-        }
-        // On older systems, return a CaptioningBridge that does nothing.
-        return new EmptyCaptioningBridge();
-    }
-}

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java

@@ -68,9 +68,6 @@ public class CaptioningChangeDelegate {
     public void onLocaleChanged(Locale locale) {}
 
     /**
-     * Unlike the original method, use Chromium's CaptioningStyle since CaptionStyle is only
-     * available on KitKat or higher. userStyle will never be null.
-     *
      * @see android.view.accessibility.CaptioningManager.CaptioningChangeListener#onUserStyleChanged
      */
     public void onUserStyleChanged(CaptioningStyle userStyle) {
@@ -108,7 +105,6 @@ public class CaptioningChangeDelegate {
     public static String getShadowFromColorAndSystemEdge(String color, Integer type) {
         String edgeShadow = "";
         if (type != null) {
-            // Lollipop adds support for EDGE_TYPE_DEPRESSED and EDGE_TYPE_RAISED.
             switch (type) {
                 case CaptionStyle.EDGE_TYPE_OUTLINE:
                     edgeShadow =
@@ -149,9 +145,7 @@ public class CaptioningChangeDelegate {
         // in Android settings app.
         String fonts[] = {// Fonts in Lollipop and above
                 "", "sans-serif", "sans-serif-condensed", "sans-serif-monospace", "serif",
-                "serif-monospace", "casual", "cursive", "sans-serif-smallcaps",
-                // Fonts in KitKat
-                "monospace"};
+                "serif-monospace", "casual", "cursive", "sans-serif-smallcaps", "monospace"};
         for (String font : fonts) {
             if (Typeface.create(font, typeFace.getStyle()).equals(typeFace)) return font;
         }

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningController.java

@@ -4,9 +4,6 @@
 
 package org.chromium.content.browser.accessibility.captioning;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
@@ -21,7 +18,7 @@ public class CaptioningController implements SystemCaptioningBridge.SystemCaptio
     private long mNativeCaptioningController;
 
     public CaptioningController(WebContents webContents) {
-        mSystemCaptioningBridge = CaptioningBridgeFactory.getSystemCaptioningBridge();
+        mSystemCaptioningBridge = CaptioningBridge.getInstance();
         mNativeCaptioningController =
                 CaptioningControllerJni.get().init(CaptioningController.this, webContents);
     }
@@ -39,7 +36,6 @@ public class CaptioningController implements SystemCaptioningBridge.SystemCaptio
         mSystemCaptioningBridge.syncToListener(this);
     }
 
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     @Override
     public void onSystemCaptioningChanged(TextTrackSettings settings) {
         if (mNativeCaptioningController == 0) return;

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningStyle.java

@@ -4,10 +4,7 @@
 
 package org.chromium.content.browser.accessibility.captioning;
 
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.graphics.Typeface;
-import android.os.Build;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
 /**
@@ -18,7 +15,6 @@ import android.view.accessibility.CaptioningManager.CaptionStyle;
  * For information on CaptionStyle, introduced in KitKat, see:
  * @link https://developer.android.com/reference/android/view/accessibility/CaptioningManager.CaptionStyle.html
  */
-@TargetApi(Build.VERSION_CODES.KITKAT)
 public class CaptioningStyle {
     private Integer mBackgroundColor;
     private Integer mEdgeColor;
@@ -105,7 +101,6 @@ public class CaptioningStyle {
      * @param captionStyle an Android platform CaptionStyle object
      * @return a Chromium CaptioningStyle object
      */
-    @SuppressLint("NewApi")
     public static CaptioningStyle createFrom(CaptionStyle captionStyle) {
         if (captionStyle == null) {
             return new CaptioningStyle(null, null, null, null, null, null);
@@ -116,28 +111,21 @@ public class CaptioningStyle {
         Integer edgeType = null;
         Integer foregroundColor = null;
         Integer windowColor = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            if (captionStyle.hasBackgroundColor()) {
-                backgroundColor = Integer.valueOf(captionStyle.backgroundColor);
-            }
-            if (captionStyle.hasEdgeColor()) {
-                edgeColor = Integer.valueOf(captionStyle.edgeColor);
-            }
-            if (captionStyle.hasEdgeType()) {
-                edgeType = Integer.valueOf(captionStyle.edgeType);
-            }
-            if (captionStyle.hasForegroundColor()) {
-                foregroundColor = Integer.valueOf(captionStyle.foregroundColor);
-            }
-            if (captionStyle.hasWindowColor()) {
-                windowColor = Integer.valueOf(captionStyle.windowColor);
-            }
-        } else {
+        if (captionStyle.hasBackgroundColor()) {
             backgroundColor = Integer.valueOf(captionStyle.backgroundColor);
+        }
+        if (captionStyle.hasEdgeColor()) {
             edgeColor = Integer.valueOf(captionStyle.edgeColor);
+        }
+        if (captionStyle.hasEdgeType()) {
             edgeType = Integer.valueOf(captionStyle.edgeType);
+        }
+        if (captionStyle.hasForegroundColor()) {
             foregroundColor = Integer.valueOf(captionStyle.foregroundColor);
         }
+        if (captionStyle.hasWindowColor()) {
+            windowColor = Integer.valueOf(captionStyle.windowColor);
+        }
 
         return new CaptioningStyle(backgroundColor, edgeColor, edgeType, foregroundColor,
                 windowColor, captionStyle.getTypeface());

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/EmptyCaptioningBridge.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.content.browser.accessibility.captioning;
-
-/**
- * This is the empty implementation of SystemCaptioningBridge that does nothing used
- * on versions of Android that do not have support for system closed captioning settings.
- */
-public class EmptyCaptioningBridge implements SystemCaptioningBridge {
-    /**
-     * A no-op implementation of the syncToListener function.
-     */
-    @Override
-    public void syncToListener(SystemCaptioningBridge.SystemCaptioningBridgeListener listener) {}
-
-    /**
-     * No-op implementation of addListener.
-     */
-    @Override
-    public void addListener(SystemCaptioningBridge.SystemCaptioningBridgeListener listener) {}
-
-    /**
-     * A no-op implementation of the removeListener function.
-     */
-    @Override
-    public void removeListener(SystemCaptioningBridge.SystemCaptioningBridgeListener listener) {}
-}

content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java

@@ -4,16 +4,12 @@
 
 package org.chromium.content.browser.accessibility.captioning;
 
-import android.annotation.TargetApi;
-import android.os.Build;
-
 import java.util.Objects;
 
 /**
  * Bundles the Closed Caption Track Settings and ensures that non-null
  * strings are used used by the recipient of this bundle.
  */
-@TargetApi(Build.VERSION_CODES.KITKAT)
 public final class TextTrackSettings {
     private static final String DEFAULT_VALUE = "";
     private boolean mTextTracksEnabled;

content/public/android/java/src/org/chromium/content/browser/input/CursorAnchorInfoController.java

@@ -4,9 +4,7 @@
 
 package org.chromium.content.browser.input;
 
-import android.annotation.TargetApi;
 import android.graphics.Matrix;
-import android.os.Build;
 import android.view.View;
 import android.view.inputmethod.CursorAnchorInfo;
 
@@ -22,10 +20,8 @@ import javax.annotation.Nonnull;
 /**
  * A state machine interface which receives Chromium internal events to determines when to call
  * {@link InputMethodManager#updateCursorAnchorInfo(View, CursorAnchorInfo)}. This interface is
- * also used in unit tests to mock out {@link CursorAnchorInfo}, which is available only in
- * Android 5.0 (Lollipop) and later.
+ * also used in unit tests to mock out {@link CursorAnchorInfo}.
  */
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 final class CursorAnchorInfoController {
     /**
      * An interface to mock out {@link View#getLocationOnScreen(int[])} for testing.

content/public/android/java/src/org/chromium/content/browser/input/ImeAdapterImpl.java

@@ -8,7 +8,6 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
@@ -208,33 +207,29 @@ public class ImeAdapterImpl
         mCurrentConfig = new Configuration(getContainerView().getResources().getConfiguration());
 
         // CursorAnchroInfo is supported only after L.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            mCursorAnchorInfoController = CursorAnchorInfoController.create(
-                    wrapper, new CursorAnchorInfoController.ComposingTextDelegate() {
-                        @Override
-                        public CharSequence getText() {
-                            return mLastText;
-                        }
-                        @Override
-                        public int getSelectionStart() {
-                            return mLastSelectionStart;
-                        }
-                        @Override
-                        public int getSelectionEnd() {
-                            return mLastSelectionEnd;
-                        }
-                        @Override
-                        public int getComposingTextStart() {
-                            return mLastCompositionStart;
-                        }
-                        @Override
-                        public int getComposingTextEnd() {
-                            return mLastCompositionEnd;
-                        }
-                    });
-        } else {
-            mCursorAnchorInfoController = null;
-        }
+        mCursorAnchorInfoController = CursorAnchorInfoController.create(
+                wrapper, new CursorAnchorInfoController.ComposingTextDelegate() {
+                    @Override
+                    public CharSequence getText() {
+                        return mLastText;
+                    }
+                    @Override
+                    public int getSelectionStart() {
+                        return mLastSelectionStart;
+                    }
+                    @Override
+                    public int getSelectionEnd() {
+                        return mLastSelectionEnd;
+                    }
+                    @Override
+                    public int getComposingTextStart() {
+                        return mLastCompositionStart;
+                    }
+                    @Override
+                    public int getComposingTextEnd() {
+                        return mLastCompositionEnd;
+                    }
+                });
         mInputMethodManagerWrapper = wrapper;
         mNativeImeAdapterAndroid = ImeAdapterImplJni.get().init(ImeAdapterImpl.this, mWebContents);
         WindowEventObserverManager.from(mWebContents).addObserver(this);

content/public/android/java/src/org/chromium/content/browser/input/InputMethodManagerWrapperImpl.java

@@ -190,11 +190,9 @@ public class InputMethodManagerWrapperImpl implements InputMethodManagerWrapper
     @Override
     public void updateCursorAnchorInfo(View view, CursorAnchorInfo cursorAnchorInfo) {
         if (DEBUG_LOGS) Log.i(TAG, "updateCursorAnchorInfo");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            InputMethodManager manager = getInputMethodManager();
-            if (manager == null) return;
-            manager.updateCursorAnchorInfo(view, cursorAnchorInfo);
-        }
+        InputMethodManager manager = getInputMethodManager();
+        if (manager == null) return;
+        manager.updateCursorAnchorInfo(view, cursorAnchorInfo);
     }
 
     @Override

content/public/android/java/src/org/chromium/content/browser/input/SuggestionsPopupWindow.java

@@ -7,10 +7,7 @@ package org.chromium.content.browser.input;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.graphics.Rect;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Build;
 import android.text.SpannableString;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -42,9 +39,6 @@ public abstract class SuggestionsPopupWindow
             "com.android.settings.USER_DICTIONARY_INSERT";
     private static final String USER_DICTIONARY_EXTRA_WORD = "word";
 
-    // From Android Settings app's @integer/maximum_user_dictionary_word_length.
-    private static final int ADD_TO_DICTIONARY_MAX_LENGTH_ON_JELLY_BEAN = 48;
-
     private final Context mContext;
     protected final TextSuggestionHost mTextSuggestionHost;
     private final View mParentView;
@@ -118,22 +112,13 @@ public abstract class SuggestionsPopupWindow
         mPopupWindow = new PopupWindow();
         mPopupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
         mPopupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            // Set the background on the PopupWindow instead of on mContentView (where we set it for
-            // pre-Lollipop) since the popup will not properly dismiss on pre-Marshmallow unless it
-            // has a background set.
-            mPopupWindow.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable(
-                    mContext.getResources(), R.drawable.floating_popup_background_light));
-            // On Lollipop and later, we use elevation to create a drop shadow effect.
-            // On pre-Lollipop, we instead use a background image on mContentView (in
-            // initContentView).
-            mPopupWindow.setElevation(mContext.getResources().getDimensionPixelSize(
-                    R.dimen.text_suggestion_popup_elevation));
-        } else {
-            // The PopupWindow does not properly dismiss pre-Marshmallow unless it has a background
-            // set.
-            mPopupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        }
+        // Set the background on the PopupWindow instead of on mContentView (where we set it for
+        // pre-Lollipop) since the popup will not properly dismiss on pre-Marshmallow unless it
+        // has a background set.
+        mPopupWindow.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable(
+                mContext.getResources(), R.drawable.floating_popup_background_light));
+        mPopupWindow.setElevation(mContext.getResources().getDimensionPixelSize(
+                R.dimen.text_suggestion_popup_elevation));
 
         mPopupWindow.setInputMethodMode(PopupWindow.INPUT_METHOD_NOT_NEEDED);
         mPopupWindow.setFocusable(true);
@@ -147,13 +132,6 @@ public abstract class SuggestionsPopupWindow
         mContentView =
                 (LinearLayout) inflater.inflate(R.layout.text_edit_suggestion_container, null);
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            // Set this on the content view instead of on the PopupWindow so we can retrieve the
-            // padding later.
-            mContentView.setBackground(ApiCompatibilityUtils.getDrawable(
-                    mContext.getResources(), R.drawable.popup_bg));
-        }
-
         // mPopupVerticalMargin is the minimum amount of space we want to have between the popup
         // and the top or bottom of the window.
         mPopupVerticalMargin = mContext.getResources().getDimensionPixelSize(
@@ -206,20 +184,6 @@ public abstract class SuggestionsPopupWindow
         final Intent intent = new Intent(ACTION_USER_DICTIONARY_INSERT);
 
         String wordToAdd = mHighlightedText;
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            // There was a bug in Jelly Bean, fixed in the initial version of KitKat, that can cause
-            // a crash if the word we try to add is too long. The "add to dictionary" intent uses an
-            // EditText widget to show the word about to be added (and allow the user to edit it).
-            // It has a maximum length of 48 characters. If a word is longer than this, it will be
-            // truncated, but the intent will try to select the full length of the word, causing a
-            // crash.
-
-            // KitKit and later still truncate the word, but avoid the crash.
-            if (wordToAdd.length() > ADD_TO_DICTIONARY_MAX_LENGTH_ON_JELLY_BEAN) {
-                wordToAdd = wordToAdd.substring(0, ADD_TO_DICTIONARY_MAX_LENGTH_ON_JELLY_BEAN);
-            }
-        }
-
         intent.putExtra(USER_DICTIONARY_EXTRA_WORD, wordToAdd);
         intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(intent);

content/public/android/java/src/org/chromium/content/browser/picker/DatePickerDialogCompat.java

@@ -7,7 +7,6 @@ package org.chromium.content.browser.picker;
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Build;
 import android.widget.DatePicker;
 
 /**
@@ -48,9 +47,7 @@ class DatePickerDialogCompat extends DatePickerDialog {
         // On Android L+, the dialog shouldn't have a title. This works around a bug in
         // DatePickerDialog where calling updateDate() before the dialog has been shown causes
         // a title to appear. http://crbug.com/541350
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            title = "";
-        }
+        title = "";
         super.setTitle(title);
     }
 }

content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java

@@ -76,7 +76,6 @@ import java.util.List;
  * Implementation of the interface {@link SelectionPopupController}.
  */
 @JNINamespace("content")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
         implements ImeEventObserver, SelectionPopupController, WindowEventObserver, HideablePopup,
                    ContainerViewObserver, UserData {

content/public/android/java/src/org/chromium/content_public/browser/InputMethodManagerWrapper.java

@@ -4,8 +4,6 @@
 
 package org.chromium.content_public.browser;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.os.IBinder;
 import android.os.ResultReceiver;
 import android.view.View;
@@ -54,7 +52,6 @@ public interface InputMethodManagerWrapper {
      * @see android.view.inputmethod.InputMethodManager#updateCursorAnchorInfo(View,
      * CursorAnchorInfo)
      */
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     void updateCursorAnchorInfo(View view, CursorAnchorInfo cursorAnchorInfo);
 
     /**

content/public/android/javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java

@@ -128,8 +128,7 @@ public class VideoFullscreenOrientationLockTest {
 
     @Test
     @MediumTest
-    @DisableIf.Build(message = "crbug.com/837423", sdk_is_greater_than = Build.VERSION_CODES.KITKAT,
-            sdk_is_less_than = Build.VERSION_CODES.M)
+    @DisableIf.Build(message = "crbug.com/837423", sdk_is_less_than = Build.VERSION_CODES.M)
     @Restriction({UiRestriction.RESTRICTION_TYPE_PHONE})
     public void testEnterExitFullscreenWithControlsButton() throws Exception {
         // Start playback to guarantee it's properly loaded.

content/public/android/javatests/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityTest.java

@@ -356,8 +356,6 @@ public class WebContentsAccessibilityTest {
      */
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEventIndices_SelectionOFF_CharacterGranularity() throws Throwable {
         // Build a simple web page with an input and the text "Testing"
         int editTextVirtualViewId = buildWebPageWithEditText(
@@ -403,8 +401,6 @@ public class WebContentsAccessibilityTest {
     @Test
     @LargeTest
     @Ignore("Skipping due to long run time")
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEventIndices_SelectionON_CharacterGranularity() throws Throwable {
         // Build a simple web page with an input and the text "Testing"
         int editTextVirtualViewId = buildWebPageWithEditText(
@@ -505,8 +501,6 @@ public class WebContentsAccessibilityTest {
      */
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEventIndices_SelectionOFF_WordGranularity() throws Throwable {
         // Build a simple web page with an input and the text "Testing this output is correct"
         int editTextVirtualViewId = buildWebPageWithEditText(
@@ -556,8 +550,6 @@ public class WebContentsAccessibilityTest {
     @Test
     @LargeTest
     @Ignore("Skipping due to long run time")
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEventIndices_SelectionON_WordGranularity() throws Throwable {
         // Build a simple web page with an input and the text "Testing this output is correct"
         int editTextVirtualViewId = buildWebPageWithEditText(
@@ -663,8 +655,6 @@ public class WebContentsAccessibilityTest {
     @Test
     @LargeTest
     @Ignore("Skipping due to long run time")
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEventIndices_contenteditable_SelectionON_CharacterGranularity()
             throws Throwable {
         int contentEditableVirtualViewId =
@@ -773,8 +763,6 @@ public class WebContentsAccessibilityTest {
      */
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testTextFieldExposesActionSetText() {
         // Load a web page with a text field.
         final String data = "<h1>Simple test page</h1>"
@@ -797,8 +785,6 @@ public class WebContentsAccessibilityTest {
      **/
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testContentEditableClassName() {
         final String data = "<div contenteditable>Edit This</div>";
 
@@ -819,8 +805,6 @@ public class WebContentsAccessibilityTest {
      **/
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEditTextFieldAriaInvalidTrueErrorMessage() {
         final String data = "<form>\n"
                 + "  First name:<br>\n"
@@ -844,8 +828,6 @@ public class WebContentsAccessibilityTest {
      **/
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEditTextFieldAriaInvalidSpellingErrorMessage() {
         final String data = "<input type='text' aria-invalid='spelling'><br>\n";
 
@@ -866,8 +848,6 @@ public class WebContentsAccessibilityTest {
      **/
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEditTextFieldAriaInvalidGrammarErrorMessage() {
         final String data = "<input type='text' aria-invalid='grammar'><br>\n";
 
@@ -887,8 +867,6 @@ public class WebContentsAccessibilityTest {
      **/
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testEditTextFieldValidNoErrorMessage() {
         final String data = "<input type='text'><br>\n";
         mActivityTestRule.launchContentShellWithUrl(UrlUtils.encodeHtmlDataUri(data));
@@ -908,8 +886,6 @@ public class WebContentsAccessibilityTest {
      **/
     @Test
     @MediumTest
-    @MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public void testSpellingError() {
         // Load a web page containing a text field with one misspelling.
         // Note that for content_shell, no spelling suggestions are enabled

content/public/android/javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java

@@ -4,10 +4,8 @@
 
 package org.chromium.content.browser.input;
 
-import android.annotation.TargetApi;
 import android.graphics.Matrix;
 import android.graphics.RectF;
-import android.os.Build;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.inputmethod.CursorAnchorInfo;
@@ -19,7 +17,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.content_public.browser.test.ContentJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.TestInputMethodManagerWrapper;
 
@@ -27,8 +24,6 @@ import org.chromium.content_public.browser.test.util.TestInputMethodManagerWrapp
  * Test for {@link CursorAnchorInfoController}.
  */
 @RunWith(ContentJUnit4ClassRunner.class)
-@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class CursorAnchorInfoControllerTest {
     private static final class TestViewDelegate implements CursorAnchorInfoController.ViewDelegate {
         public int locationX;

content/public/android/javatests/src/org/chromium/content/browser/input/ImeLollipopTest.java

@@ -4,8 +4,6 @@
 
 package org.chromium.content.browser.input;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.view.inputmethod.CursorAnchorInfo;
 import android.view.inputmethod.InputConnection;
 
@@ -19,7 +17,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.content_public.browser.test.ContentJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
@@ -31,8 +28,6 @@ import java.util.concurrent.Callable;
  * Integration tests for text input for Android L (or above) features.
  */
 @RunWith(ContentJUnit4ClassRunner.class)
-@MinAndroidSdkLevel(Build.VERSION_CODES.LOLLIPOP)
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class ImeLollipopTest {
     @Rule
     public ImeActivityTestRule mRule = new ImeActivityTestRule();

content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java

@@ -4,12 +4,10 @@
 
 package org.chromium.content_shell_apk;
 
-import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.PowerManager;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.rule.ActivityTestRule;
@@ -72,17 +70,12 @@ public class ContentShellActivityTestRule extends ActivityTestRule<ContentShellA
     }
 
     @Override
-    @TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
     @SuppressWarnings("deprecation")
     protected void beforeActivityLaunched() {
         PowerManager pm = (PowerManager) InstrumentationRegistry.getInstrumentation()
                                   .getContext()
                                   .getSystemService(Context.POWER_SERVICE);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
-            Assert.assertTrue("Many tests will fail if the screen is not on.", pm.isInteractive());
-        } else {
-            Assert.assertTrue("Many tests will fail if the screen is not on.", pm.isScreenOn());
-        }
+        Assert.assertTrue("Many tests will fail if the screen is not on.", pm.isInteractive());
     }
 
     /**

content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java

@@ -4,9 +4,7 @@
 
 package org.chromium.content_shell_apk;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build;
 import android.os.PowerManager;
 import android.support.test.InstrumentationRegistry;
 
@@ -25,7 +23,6 @@ import org.chromium.base.test.util.Feature;
 @RunWith(BaseJUnit4ClassRunner.class)
 public class ContentShellPreconditionsTest {
     @Test
-    @TargetApi(Build.VERSION_CODES.KITKAT_WATCH)
     @SuppressWarnings("deprecation")
     @MediumTest
     @Feature({"TestInfrastructure"})
@@ -33,10 +30,6 @@ public class ContentShellPreconditionsTest {
         PowerManager pm = (PowerManager) InstrumentationRegistry.getContext().getSystemService(
                 Context.POWER_SERVICE);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
-            Assert.assertTrue("Many tests will fail if the screen is not on.", pm.isInteractive());
-        } else {
-            Assert.assertTrue("Many tests will fail if the screen is not on.", pm.isScreenOn());
-        }
+        Assert.assertTrue("Many tests will fail if the screen is not on.", pm.isInteractive());
     }
 }