Remove ICS support code in chrome/ and components/precache/

BUG=473837,431717
TBR=bengr@chromium.org

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

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

chrome/android/java/src/org/chromium/chrome/browser/appmenu/AppMenu.java

@@ -11,7 +11,6 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -222,8 +221,7 @@ public class AppMenu implements OnItemClickListener, OnKeyListener {
         }
 
         // Don't animate the menu items for low end devices.
-        if (!SysUtils.isLowEndDevice()
-                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+        if (!SysUtils.isLowEndDevice()) {
             mPopup.getListView().addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
                 @Override
                 public void onLayoutChange(View v, int left, int top, int right, int bottom,

chrome/android/java/src/org/chromium/chrome/browser/fullscreen/ChromeFullscreenManager.java

@@ -9,7 +9,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.res.Resources;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
@@ -51,8 +50,7 @@ public class ChromeFullscreenManager
     // Maximum length of the slide in/out animation of the toolbar (in ms).
     private static final long MAX_ANIMATION_DURATION_MS = 500;
 
-    private static final int MSG_ID_CONTROLS_REQUEST_LAYOUT = 1;
-    private static final int MSG_ID_HIDE_CONTROLS = 2;
+    private static final int MSG_ID_HIDE_CONTROLS = 1;
 
     private final HashSet<Integer> mPersistentControlTokens = new HashSet<Integer>();
 
@@ -166,9 +164,6 @@ public class ChromeFullscreenManager
             ChromeFullscreenManager chromeFullscreenManager = mChromeFullscreenManager.get();
             if (chromeFullscreenManager == null) return;
             switch (msg.what) {
-                case MSG_ID_CONTROLS_REQUEST_LAYOUT:
-                    chromeFullscreenManager.mControlContainer.requestLayout();
-                    break;
                 case MSG_ID_HIDE_CONTROLS:
                     chromeFullscreenManager.update(false);
                     break;
@@ -505,14 +500,6 @@ public class ChromeFullscreenManager
             scheduleVisibilityUpdate();
             if (shouldShowAndroidControls()) mControlContainer.setTranslationY(getControlOffset());
 
-            // In ICS, the toolbar can appear clipped when compositor content is not being drawn
-            // beneath it (at the top of the page, during side swipe).  Requesting a layout clears
-            // up the issue (see crbug.com/172631).
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-                if (!mHandler.hasMessages(MSG_ID_CONTROLS_REQUEST_LAYOUT)) {
-                    mHandler.sendEmptyMessage(MSG_ID_CONTROLS_REQUEST_LAYOUT);
-                }
-            }
             for (int i = 0; i < mListeners.size(); i++) {
                 mListeners.get(i).onVisibleContentOffsetChanged(getVisibleContentOffset());
             }

chrome/android/java/src/org/chromium/chrome/browser/infobar/AnimationHelper.java

@@ -9,8 +9,6 @@ import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -217,15 +215,13 @@ public class AnimationHelper implements ViewTreeObserver.OnGlobalLayoutListener
                 mTargetWrapperView.startTransition();
             }
 
-            @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
             @Override
             public void onAnimationEnd(Animator animation) {
                 mTargetWrapperView.finishTransition();
                 mContainer.finishTransition();
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN && mToShow != null
-                        && (mAnimationType == ANIMATION_TYPE_SHOW
-                                || mAnimationType == ANIMATION_TYPE_SWAP)) {
+                if (mToShow != null && (mAnimationType == ANIMATION_TYPE_SHOW
+                        || mAnimationType == ANIMATION_TYPE_SWAP)) {
                     TextView messageView = (TextView) mToShow.findViewById(R.id.infobar_message);
                     if (messageView != null) {
                         mToShow.announceForAccessibility(messageView.getText());

chrome/android/java/src/org/chromium/chrome/browser/media/remote/LockScreenTransportControl.java

@@ -7,6 +7,7 @@ package org.chromium.chrome.browser.media.remote;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.util.Log;
 import android.view.KeyEvent;
 
@@ -106,7 +107,7 @@ public abstract class LockScreenTransportControl
                 // wallpaper (which we set to the poster of the current video) when the phone is
                 // locked. Also, once the minSdkVersion is updated in the manifest, get rid of the
                 // code for older SDK versions.
-                if (android.os.Build.VERSION.SDK_INT < 18) {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
                     sInstance = new LockScreenTransportControlV16(context);
                 } else {
                     sInstance = new LockScreenTransportControlV18(context);

chrome/android/java/src/org/chromium/chrome/browser/metrics/MemoryUma.java

@@ -12,7 +12,6 @@ import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_LOW;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_RUNNING_MODERATE;
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN;
 
-import android.os.Build;
 import android.os.SystemClock;
 
 import org.chromium.base.metrics.RecordHistogram;
@@ -75,8 +74,6 @@ public class MemoryUma {
 
     private static void memoryNotificationForeground(int notification) {
         assert notification >= 0 && notification < FOREGROUND_MAX;
-        // Before Jelly Bean we have only LowMemory foreground notification.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return;
         RecordHistogram.recordEnumeratedHistogram("MemoryAndroid.NotificationForeground",
                 notification, FOREGROUND_MAX);
     }

chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.contextmenu;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.os.Build;
 import android.test.FlakyTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.ContextMenu;
@@ -96,8 +95,6 @@ public class ContextMenuTest extends ChromeShellTestBase {
     // @MediumTest
     @Feature({"Browser"})
     public void testCopyImageToClipboard() throws InterruptedException, TimeoutException {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return;
-
         Tab tab = getActivity().getActiveTab();
         ContextMenuUtils.selectContextMenuItem(this, tab, "testImage",
                 R.id.contextmenu_copy_image);

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerTest.java

@@ -16,7 +16,6 @@ import android.test.suitebuilder.annotation.SmallTest;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
 import org.chromium.chrome.browser.preferences.website.PushNotificationInfo;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
@@ -36,7 +35,6 @@ import java.util.concurrent.TimeoutException;
  *
  * Web Notifications are only supported on Android JellyBean and beyond.
  */
-@MinAndroidSdkLevel(Build.VERSION_CODES.JELLY_BEAN)
 public class NotificationUIManagerTest extends ChromeShellTestBase {
     private static final String NOTIFICATION_TEST_PAGE =
             TestHttpServerClient.getUrl("chrome/test/data/notifications/android_test.html");

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/WebsiteAddressTest.java

@@ -4,21 +4,16 @@
 
 package org.chromium.chrome.browser.preferences.website;
 
-import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Smoke;
 
 import org.chromium.base.CommandLine;
 import org.chromium.base.test.util.Feature;
-import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 /**
  * Tests for WebsiteAddress.
- * loadNativeLibraryAndInitBrowserProcess seems to be flaky on ICS.
- * http://crbug.com/431717
  */
-@MinAndroidSdkLevel(Build.VERSION_CODES.JELLY_BEAN)
 public class WebsiteAddressTest extends NativeLibraryTestBase {
 
     @Smoke

chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java

@@ -196,7 +196,6 @@ public class PrintingControllerTest extends ChromeShellTestBase {
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
     private void callLayoutOnUiThread(
             final PrintingControllerImpl controller,
             final PrintAttributes oldAttributes,

components/precache/android/java/src/org/chromium/components/precache/NetworkInfoDelegate.java

@@ -7,7 +7,6 @@ package org.chromium.components.precache;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.os.Build;
 
 import org.chromium.base.VisibleForTesting;
 
@@ -52,10 +51,6 @@ public class NetworkInfoDelegate {
     }
 
     protected boolean isActiveNetworkMetered() {
-        // ConnectivityManager.isActiveNetworkMetered was added in SDK API 16.
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
-            return false;
-        }
         return mConnectivityManager.isActiveNetworkMetered();
     }
 }