Revert of [Android] Respect animation multiplier from Developer Options.

chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimation.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimation.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimation.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimation.java
index be825b1363c00e843ea2f97b8b588c39289225e8..5933a66a8e46883d77b32d6ee32565aec3c7377a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimation.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimation.java
@@ -4,16 +4,11 @@
 
 package org.chromium.chrome.browser.compositor.layouts;
 
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.os.SystemClock;
-import android.provider.Settings;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
-
-import org.chromium.base.ContextUtils;
 
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -36,10 +31,9 @@
     private static final int FIRST_FRAME_OFFSET_MS = 1000 / 60;
 
     /**
-     * Multiplier for animation durations for debugging. Can be set in Developer Options and cached
-     * here.
-     */
-    private static Float sAnimationMultiplier;
+     * Can be used to slow down created animations for debugging purposes.
+     */
+    private static final int ANIMATION_MULTIPLIER = 1;
 
     private final AtomicBoolean mFinishCalled = new AtomicBoolean();
     private final ArrayList<Animation<T>> mAnimations = new ArrayList<Animation<T>>();
@@ -262,24 +256,9 @@
             mAnimatedObject = t;
             mStart = start;
             mEnd = end;
-            float animationMultiplier = getAnimationMultiplier();
-            mDuration = (long) (duration * animationMultiplier);
-            mStartDelay = (long) (startTime * animationMultiplier);
+            mDuration = duration * ANIMATION_MULTIPLIER;
+            mStartDelay = startTime * ANIMATION_MULTIPLIER;
             mCurrentTime = 0;
-        }
-
-        @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-        private float getAnimationMultiplier() {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) return 1f;
-
-            synchronized (sLock) {
-                if (sAnimationMultiplier == null) {
-                    sAnimationMultiplier = Settings.Global.getFloat(
-                            ContextUtils.getApplicationContext().getContentResolver(),
-                            Settings.Global.ANIMATOR_DURATION_SCALE, 1f);
-                }
-                return sAnimationMultiplier;
-            }
         }
 
         /**