[Feed] Speculative fix for flaky render test on Feed NTP

+ NewTabPageTest#testRender_FocusFakeBox
+ NewTabPageTest#testRender_ArticleSectionHeader

Bug: 888129, 888997
Change-Id: Ic7d66bf90c1fe0a42c22224a5a889a04e6ffb7d1
Reviewed-on: https://chromium-review.googlesource.com/1249129Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594880}

chrome/android/java/src/org/chromium/chrome/browser/widget/ScrimView.java

@@ -14,6 +14,7 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.ViewGroup.MarginLayoutParams;
 
 import org.chromium.base.ApiCompatibilityUtils;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.widget.animation.CancelAwareAnimatorListener;
@@ -134,6 +135,9 @@ public class ScrimView extends View implements View.OnClickListener {
     /** The current set of params affecting the scrim. */
     private ScrimParams mActiveParams;
 
+    /** The duration for the fading animation. This can be overridden for testing. */
+    private int mFadeDurationMs;
+
     /**
      * @param context An Android {@link Context} for creating the view.
      * @param scrimDelegate A means of changing the scrim over the status bar.
@@ -146,6 +150,7 @@ public class ScrimView extends View implements View.OnClickListener {
         mParent = parent;
         mDefaultBackgroundColor = ApiCompatibilityUtils.getColor(
                 getResources(), R.color.omnibox_focused_fading_background_color);
+        mFadeDurationMs = FADE_DURATION_MS;
 
         setAlpha(0.0f);
         setVisibility(View.GONE);
@@ -245,7 +250,7 @@ public class ScrimView extends View implements View.OnClickListener {
         }
         if (mOverlayFadeInAnimator == null) {
             mOverlayFadeInAnimator = ObjectAnimator.ofFloat(this, ALPHA, 1f);
-            mOverlayFadeInAnimator.setDuration(FADE_DURATION_MS);
+            mOverlayFadeInAnimator.setDuration(mFadeDurationMs);
             mOverlayFadeInAnimator.setInterpolator(BakedBezierInterpolator.FADE_IN_CURVE);
         }
 
@@ -258,7 +263,7 @@ public class ScrimView extends View implements View.OnClickListener {
     public void hideScrim(boolean fadeOut) {
         if (mOverlayFadeOutAnimator == null) {
             mOverlayFadeOutAnimator = ObjectAnimator.ofFloat(this, ALPHA, 0f);
-            mOverlayFadeOutAnimator.setDuration(FADE_DURATION_MS);
+            mOverlayFadeOutAnimator.setDuration(mFadeDurationMs);
             mOverlayFadeOutAnimator.setInterpolator(BakedBezierInterpolator.FADE_OUT_CURVE);
             mOverlayFadeOutAnimator.addListener(new CancelAwareAnimatorListener() {
                 @Override
@@ -296,4 +301,9 @@ public class ScrimView extends View implements View.OnClickListener {
         if (mActiveParams == null || mActiveParams.observer == null) return;
         mActiveParams.observer.onScrimClick();
     }
+
+    @VisibleForTesting
+    public void disableAnimationForTesting(boolean disable) {
+        mFadeDurationMs = disable ? 0 : FADE_DURATION_MS;
+    }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java

@@ -61,6 +61,7 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.suggestions.SiteSuggestion;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.chrome.browser.widget.ScrimView;
 import org.chromium.chrome.test.ChromeJUnit4RunnerDelegate;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
 import org.chromium.chrome.test.util.ChromeTabUtils;
@@ -207,8 +208,12 @@ public class NewTabPageTest {
     @EnableFeatures({ChromeFeatureList.CONTENT_SUGGESTIONS_SCROLL_TO_LOAD})
     @ParameterAnnotations.UseMethodParameter(InterestFeedParams.class)
     public void testRender_FocusFakeBox(boolean interestFeedEnabled) throws Exception {
+        ScrimView scrimView = mActivityTestRule.getActivity().getScrim();
+        scrimView.disableAnimationForTesting(true);
         onView(withId(R.id.search_box)).perform(click());
+        RenderTestRule.sanitize(mNtp.getView().getRootView());
         mRenderTestRule.render(mNtp.getView().getRootView(), "focus_fake_box");
+        scrimView.disableAnimationForTesting(false);
     }
 
     @Test
@@ -225,10 +230,15 @@ public class NewTabPageTest {
     @Test
     @SmallTest
     @Feature({"NewTabPage", "FeedNewTabPage", "RenderTest"})
+    @EnableFeatures({ChromeFeatureList.CONTENT_SUGGESTIONS_SCROLL_TO_LOAD})
     @ParameterAnnotations.UseMethodParameter(InterestFeedParams.class)
     public void testRender_ArticleSectionHeader(boolean interestFeedEnabled) throws Exception {
         // Scroll to the article section header in case it is not visible.
         onView(instanceOf(RecyclerView.class)).perform(RecyclerViewActions.scrollToPosition(2));
+        if (!interestFeedEnabled) {
+            RecyclerViewTestUtils.waitForStableRecyclerView(
+                    mNtp.getNewTabPageView().getRecyclerView());
+        }
         View view = mNtp.getSectionHeaderViewForTesting();
 
         // Check header is expanded.
@@ -285,7 +295,6 @@ public class NewTabPageTest {
      */
     @Test
     @SmallTest
-    @DisabledTest(message = "https://crbug.com/888129")
     @Feature({"NewTabPage", "FeedNewTabPage"})
     @ParameterAnnotations.UseMethodParameter(InterestFeedParams.class)
     public void testFocusFakebox(boolean interestFeedEnabled) {