Remove ICS support from Chromium code.

minSkd is now 16, so we no longer need to support ICS. This
code removes some of that support in base/content/media/ui.

BUG=473837

Review URL: https://codereview.chromium.org/1123823002

Cr-Commit-Position: refs/heads/master@{#328244}

5 files changed, 24 insertions, 90 deletions

diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 2dd69ba..67a5e6e 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -2900,8 +2900,7 @@ public class ContentViewCore
         }
 
         if (mNativeAccessibilityAllowed && !mNativeAccessibilityEnabled
-                && mNativeContentViewCore != 0
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                && mNativeContentViewCore != 0) {
             mNativeAccessibilityEnabled = true;
             nativeSetAccessibilityEnabled(mNativeContentViewCore, true);
         }
diff --git a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java
index 19eb219..2fe14d0 100644
--- a/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java
+++ b/content/public/android/java/src/org/chromium/content/browser/MediaResourceGetter.java
@@ -128,10 +128,6 @@ class MediaResourceGetter {
 
     @VisibleForTesting
     MediaMetadata extract(int fd, long offset, long length) {
-        if (!androidDeviceOk(android.os.Build.MODEL, android.os.Build.VERSION.SDK_INT)) {
-            return EMPTY_METADATA;
-        }
-
         configure(fd, offset, length);
         return doExtractMetadata();
     }
@@ -139,10 +135,6 @@ class MediaResourceGetter {
     @VisibleForTesting
     MediaMetadata extract(final Context context, final String url,
                           final String cookies, final String userAgent) {
-        if (!androidDeviceOk(android.os.Build.MODEL, android.os.Build.VERSION.SDK_INT)) {
-            return EMPTY_METADATA;
-        }
-
         if (!configure(context, url, cookies, userAgent)) {
             Log.e(TAG, "Unable to configure metadata extractor");
             return EMPTY_METADATA;
@@ -329,18 +321,6 @@ class MediaResourceGetter {
         return false;
     }
 
-    /**
-     * Special case handling for device/OS combos that simply do not work.
-     * @param model the model of device being examined
-     * @param sdkVersion the version of the SDK installed on the device
-     * @return true if the device can be used correctly, otherwise false
-     */
-    @VisibleForTesting
-    static boolean androidDeviceOk(final String model, final int sdkVersion) {
-        return !("GT-I9100".contentEquals(model)
-                && sdkVersion < android.os.Build.VERSION_CODES.JELLY_BEAN);
-    }
-
     // The methods below can be used by unit tests to fake functionality.
     @VisibleForTesting
     File uriToFile(String path) {
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
index 68b0245..914b80a 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java
@@ -4,7 +4,6 @@
 
 package org.chromium.content.browser.accessibility;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
@@ -32,14 +31,8 @@ import java.util.Locale;
 
 /**
  * Native accessibility for a {@link ContentViewCore}.
- *
- * This class is safe to load on ICS and can be used to run tests, but
- * only the subclass, JellyBeanBrowserAccessibilityManager, actually
- * has a AccessibilityNodeProvider implementation needed for native
- * accessibility.
  */
 @JNINamespace("content")
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class BrowserAccessibilityManager {
     private static final String TAG = "BrowserAccessibilityManager";
 
@@ -48,6 +41,7 @@ public class BrowserAccessibilityManager {
     private static final String ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE =
             "ACTION_ARGUMENT_SET_TEXT_CHARSEQUENCE";
 
+    private final AccessibilityNodeProvider mAccessibilityNodeProvider;
     private ContentViewCore mContentViewCore;
     private final AccessibilityManager mAccessibilityManager;
     private final RenderCoordinates mRenderCoordinates;
@@ -80,9 +74,6 @@ public class BrowserAccessibilityManager {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             return new LollipopBrowserAccessibilityManager(
                     nativeBrowserAccessibilityManagerAndroid, contentViewCore);
-        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            return new JellyBeanBrowserAccessibilityManager(
-                    nativeBrowserAccessibilityManagerAndroid, contentViewCore);
         } else {
             return new BrowserAccessibilityManager(
                     nativeBrowserAccessibilityManagerAndroid, contentViewCore);
@@ -102,6 +93,25 @@ public class BrowserAccessibilityManager {
         mAccessibilityManager =
             (AccessibilityManager) mContentViewCore.getContext()
             .getSystemService(Context.ACCESSIBILITY_SERVICE);
+
+        final BrowserAccessibilityManager delegate = this;
+        mAccessibilityNodeProvider = new AccessibilityNodeProvider() {
+            @Override
+            public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
+                return delegate.createAccessibilityNodeInfo(virtualViewId);
+            }
+
+            @Override
+            public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text,
+                    int virtualViewId) {
+                return delegate.findAccessibilityNodeInfosByText(text, virtualViewId);
+            }
+
+            @Override
+            public boolean performAction(int virtualViewId, int action, Bundle arguments) {
+                return delegate.performAction(virtualViewId, action, arguments);
+            }
+        };
     }
 
     @CalledByNative
@@ -114,10 +124,10 @@ public class BrowserAccessibilityManager {
     }
 
     /**
-     * @return An AccessibilityNodeProvider on JellyBean, and null on previous versions.
+     * @return An AccessibilityNodeProvider.
      */
     public AccessibilityNodeProvider getAccessibilityNodeProvider() {
-        return null;
+        return mAccessibilityNodeProvider;
     }
 
     /**
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanBrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanBrowserAccessibilityManager.java
deleted file mode 100644
index 98f8863..0000000
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/JellyBeanBrowserAccessibilityManager.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 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.os.Build;
-import android.os.Bundle;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.view.accessibility.AccessibilityNodeProvider;
-
-import org.chromium.base.JNINamespace;
-import org.chromium.content.browser.ContentViewCore;
-
-import java.util.List;
-
-/**
- * Subclass of BrowserAccessibilityManager for JellyBean that creates an
- * AccessibilityNodeProvider and delegates its implementation to this object.
- */
-@JNINamespace("content")
-@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-public class JellyBeanBrowserAccessibilityManager extends BrowserAccessibilityManager {
-    private AccessibilityNodeProvider mAccessibilityNodeProvider;
-
-    JellyBeanBrowserAccessibilityManager(long nativeBrowserAccessibilityManagerAndroid,
-            ContentViewCore contentViewCore) {
-        super(nativeBrowserAccessibilityManagerAndroid, contentViewCore);
-
-        final BrowserAccessibilityManager delegate = this;
-        mAccessibilityNodeProvider = new AccessibilityNodeProvider() {
-            @Override
-            public AccessibilityNodeInfo createAccessibilityNodeInfo(int virtualViewId) {
-                return delegate.createAccessibilityNodeInfo(virtualViewId);
-            }
-
-            @Override
-            public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String text,
-                    int virtualViewId) {
-                return delegate.findAccessibilityNodeInfosByText(text, virtualViewId);
-            }
-
-            @Override
-            public boolean performAction(int virtualViewId, int action, Bundle arguments) {
-                return delegate.performAction(virtualViewId, action, arguments);
-            }
-        };
-    }
-
-    @Override
-    public AccessibilityNodeProvider getAccessibilityNodeProvider() {
-        return mAccessibilityNodeProvider;
-    }
-}
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java
index f5c3af1..3e2cd58 100644
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/LollipopBrowserAccessibilityManager.java
@@ -20,7 +20,7 @@ import org.chromium.content.browser.ContentViewCore;
  */
 @JNINamespace("content")
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-public class LollipopBrowserAccessibilityManager extends JellyBeanBrowserAccessibilityManager {
+public class LollipopBrowserAccessibilityManager extends BrowserAccessibilityManager {
     LollipopBrowserAccessibilityManager(long nativeBrowserAccessibilityManagerAndroid,
             ContentViewCore contentViewCore) {
         super(nativeBrowserAccessibilityManagerAndroid, contentViewCore);