Fix tests which fail when animation is disabled.

Bug: 878176
Change-Id: I93ccf352800b60caadbc2a20d857d6122e634789
Reviewed-on: https://chromium-review.googlesource.com/1199487Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Commit-Queue: Anna Malova <amalova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588415}

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

@@ -267,6 +267,12 @@ public class ChromeAnimation<T> {
             }
         }
 
+        public static void unsetAnimationMultiplierForTesting() {
+            synchronized (sLock) {
+                sAnimationMultiplier = null;
+            }
+        }
+
         @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
         public static float getAnimationMultiplier() {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) return 1f;

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

@@ -5,9 +5,11 @@
 package org.chromium.chrome.browser.infobar;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import android.view.View;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.download.DownloadInfoBarController;
 import org.chromium.chrome.browser.download.DownloadManagerService;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.PopupState;
@@ -65,15 +67,16 @@ class IPHBubbleDelegateImpl implements IPHInfoBarSupport.IPHBubbleDelegate {
         }
     }
 
-    private TrackerParameters getTrackerParameters(@InfoBarIdentifier int infoBarId) {
+    private @Nullable TrackerParameters getTrackerParameters(@InfoBarIdentifier int infoBarId) {
         switch (infoBarId) {
             case InfoBarIdentifier.DATA_REDUCTION_PROXY_PREVIEW_INFOBAR_DELEGATE:
                 return new TrackerParameters(FeatureConstants.DATA_SAVER_PREVIEW_FEATURE,
                         R.string.iph_data_saver_preview_text, R.string.iph_data_saver_preview_text);
             case InfoBarIdentifier.DOWNLOAD_PROGRESS_INFOBAR_ANDROID:
-                return DownloadManagerService.getDownloadManagerService()
-                        .getInfoBarController(Profile.getLastUsedProfile().isOffTheRecord())
-                        .getTrackerParameters();
+                DownloadInfoBarController controller =
+                        DownloadManagerService.getDownloadManagerService()
+                        .getInfoBarController(Profile.getLastUsedProfile().isOffTheRecord());
+                return controller != null ? controller.getTrackerParameters() : null;
             default:
                 return null;
         }

chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileEditorPreference.java

@@ -82,17 +82,14 @@ public class AutofillProfileEditorPreference extends Preference {
         if (mGUID != null) {
             mAutofillAddress = new AutofillAddress(
                     mActivity, PersonalDataManager.getInstance().getProfile(mGUID));
-            runnable = new Runnable() {
-                @Override
-                public void run() {
-                    if (mGUID != null) {
-                        PersonalDataManager.getInstance().deleteProfile(mGUID);
-                        SettingsAutofillAndPaymentsObserver.getInstance().notifyOnAddressDeleted(
-                                mGUID);
-                    }
-                    if (mObserverForTest != null) {
-                        mObserverForTest.onEditorReadyToEdit();
-                    }
+            runnable = () -> {
+                if (mGUID != null) {
+                    PersonalDataManager.getInstance().deleteProfile(mGUID);
+                    SettingsAutofillAndPaymentsObserver.getInstance().notifyOnAddressDeleted(
+                            mGUID);
+                }
+                if (mObserverForTest != null) {
+                    mObserverForTest.onEditorReadyToEdit();
                 }
             };
         }

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/ChromeAnimationTest.java

@@ -10,6 +10,7 @@ import android.os.SystemClock;
 import android.support.annotation.IntDef;
 import android.support.test.filters.SmallTest;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,6 +47,12 @@ public class ChromeAnimationTest implements Animatable {
     public void setUp() throws Exception {
         mHasFinishedFastAnimation = false;
         mHasFinishedSlowAnimation = false;
+        ChromeAnimation.Animation.setAnimationMultiplierForTesting(1f);
+    }
+
+    @After
+    public void tearDown() {
+        ChromeAnimation.Animation.unsetAnimationMultiplierForTesting();
     }
 
     @Override

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

@@ -79,23 +79,13 @@ public class ContextMenuTest implements CustomMainActivityStart {
 
     @Before
     public void setUp() throws Exception {
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                FirstRunStatus.setFirstRunFlowComplete(true);
-            }
-        });
+        ThreadUtils.runOnUiThreadBlocking(() -> FirstRunStatus.setFirstRunFlowComplete(true));
     }
 
     @After
     public void tearDown() throws Exception {
         mTestServer.stopAndDestroyServer();
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                FirstRunStatus.setFirstRunFlowComplete(false);
-            }
-        });
+        ThreadUtils.runOnUiThreadBlocking(() -> FirstRunStatus.setFirstRunFlowComplete(false));
         deleteTestFiles();
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTest.java

@@ -322,7 +322,7 @@ public class DownloadTest implements CustomMainActivityStart {
         final int count = model.getCount();
 
         InstrumentationRegistry.getInstrumentation().runOnMainSync(
-                (Runnable) () -> TabModelUtils.setIndex(model, count - 1));
+                () -> TabModelUtils.setIndex(model, count - 1));
 
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
@@ -353,7 +353,7 @@ public class DownloadTest implements CustomMainActivityStart {
             @Override
             public boolean isSatisfied() {
                 CompositorViewHolder compositorViewHolder =
-                        (CompositorViewHolder) mDownloadTestRule.getActivity().findViewById(
+                        mDownloadTestRule.getActivity().findViewById(
                                 R.id.compositor_view_holder);
                 LayoutManager layoutManager = compositorViewHolder.getLayoutManager();
 

chrome/android/javatests/src/org/chromium/chrome/browser/preferences/autofill/AutofillTestRule.java

@@ -50,16 +50,16 @@ class AutofillTestRule extends ChromeBrowserTestRule implements EditorObserverFo
     protected void clickInEditorAndWait(final int resourceId)
             throws InterruptedException, TimeoutException {
         int callCount = mClickUpdate.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(
-                (Runnable) () -> mEditorDialog.findViewById(resourceId).performClick());
+        ThreadUtils.runOnUiThreadBlockingNoException(
+                () -> mEditorDialog.findViewById(resourceId).performClick());
         mClickUpdate.waitForCallback(callCount);
     }
 
     protected void clickInEditorAndWaitForValidationError(final int resourceId)
             throws InterruptedException, TimeoutException {
         int callCount = mValidationUpdate.getCallCount();
-        ThreadUtils.runOnUiThreadBlocking(
-                (Runnable) () -> mEditorDialog.findViewById(resourceId).performClick());
+        ThreadUtils.runOnUiThreadBlockingNoException(
+                () -> mEditorDialog.findViewById(resourceId).performClick());
         mValidationUpdate.waitForCallback(callCount);
     }
 
@@ -80,8 +80,11 @@ class AutofillTestRule extends ChromeBrowserTestRule implements EditorObserverFo
         mPreferenceUpdate.waitForCallback(callCount);
     }
 
-    protected void setEditorDialog(EditorDialog editorDialog) {
+    protected void setEditorDialogAndWait(EditorDialog editorDialog)
+            throws TimeoutException, InterruptedException {
+        int callCount = mClickUpdate.getCallCount();
         mEditorDialog = editorDialog;
+        mClickUpdate.waitForCallback(callCount);
     }
 
     @Override