Move NTP sign-in promo to be above the article section

Bug: 890094
Change-Id: Ie5637c98d33b8602d54d86c698c63eea60f7802c
Reviewed-on: https://chromium-review.googlesource.com/c/1294194Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Becky Zhou <huayinz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601752}

chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java

@@ -89,16 +89,9 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder>
 
         if (mAboveTheFoldView != null) mRoot.addChildren(new AboveTheFoldItem());
 
-        if (SuggestionsConfig.scrollToLoad()) {
-            // If scroll-to-load is enabled, show the sign-in promo above suggested content.
-            if (mSigninPromo != null) mRoot.addChildren(mSigninPromo);
-            mRoot.addChildren(mAllDismissed);
-            mRoot.addChildren(mSections);
-        } else {
-            mRoot.addChildren(mSections);
-            if (mSigninPromo != null) mRoot.addChildren(mSigninPromo);
-            mRoot.addChildren(mAllDismissed);
-        }
+        // Show the sign-in promo above suggested content.
+        if (mSigninPromo != null) mRoot.addChildren(mSigninPromo);
+        mRoot.addChildren(mAllDismissed, mSections);
 
         mFooter = new Footer();
         mRoot.addChildren(mFooter);

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

@@ -210,7 +210,6 @@ public class NewTabPageTest {
     @Test
     @SmallTest
     @Feature({"NewTabPage", "FeedNewTabPage", "RenderTest"})
-    @EnableFeatures({ChromeFeatureList.CONTENT_SUGGESTIONS_SCROLL_TO_LOAD})
     @ParameterAnnotations.UseMethodParameter(InterestFeedParams.class)
     public void testRender_FocusFakeBox(boolean interestFeedEnabled) throws Exception {
         ScrimView scrimView = mActivityTestRule.getActivity().getScrim();
@@ -224,7 +223,6 @@ public class NewTabPageTest {
     @Test
     @SmallTest
     @Feature({"NewTabPage", "FeedNewTabPage", "RenderTest"})
-    @EnableFeatures({ChromeFeatureList.CONTENT_SUGGESTIONS_SCROLL_TO_LOAD})
     @ParameterAnnotations.UseMethodParameter(InterestFeedParams.class)
     public void testRender_SignInPromo(boolean interestFeedEnabled) throws Exception {
         // Scroll to the sign in promo in case it is not visible.
@@ -235,7 +233,6 @@ 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.

chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java

@@ -910,7 +910,7 @@ public class NewTabPageAdapterTest {
         resetUiDelegate();
         reloadNtp();
 
-        assertItemsFor(sectionWithStatusCard().withProgress(), signinPromo());
+        assertItemsFor(signinPromo(), sectionWithStatusCard().withProgress());
         assertTrue(isSignInPromoVisible());
 
         List<DestructionObserver> observers = getDestructionObserver(mUiDelegate);