[NTP Client] Refresh the visiblity of AllDismissed when items change

Adds a mocking method for Feature flags in SnippetsConfig

BUG=657319

Review-Url: https://codereview.chromium.org/2434263002
Cr-Commit-Position: refs/heads/master@{#427090}

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

@@ -31,6 +31,10 @@ public abstract class InnerNode extends ChildNode implements NodeParent {
 
     private int getStartingOffsetForChildIndex(int childIndex) {
         List<TreeNode> children = getChildren();
+        if (childIndex < 0 || childIndex >= children.size()) {
+            throw new IndexOutOfBoundsException(childIndex + "/" + children.size());
+        }
+
         int offset = 0;
         for (int i = 0; i < childIndex; i++) {
             offset += children.get(i).getItemCount();

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

@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.ntp.snippets.SectionHeaderViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticleViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
+import org.chromium.chrome.browser.ntp.snippets.SnippetsConfig;
 import org.chromium.chrome.browser.ntp.snippets.SuggestionsSource;
 
 import java.util.ArrayList;
@@ -138,6 +139,24 @@ public class NewTabPageAdapter
             protected List<TreeNode> getChildren() {
                 return mChildren;
             }
+
+            @Override
+            public void onItemRangeChanged(TreeNode child, int index, int count) {
+                if (mChildren.isEmpty()) return; // The sections have not been initialised yet.
+                super.onItemRangeChanged(child, index, count);
+            }
+
+            @Override
+            public void onItemRangeInserted(TreeNode child, int index, int count) {
+                if (mChildren.isEmpty()) return; // The sections have not been initialised yet.
+                super.onItemRangeInserted(child, index, count);
+            }
+
+            @Override
+            public void onItemRangeRemoved(TreeNode child, int index, int count) {
+                if (mChildren.isEmpty()) return; // The sections have not been initialised yet.
+                super.onItemRangeRemoved(child, index, count);
+            }
         };
 
         mSigninPromo = new SignInPromo(mRoot, this);
@@ -155,6 +174,7 @@ public class NewTabPageAdapter
      */
     public void resetSections(boolean alwaysAllowEmptySections) {
         mSections.clear();
+        mChildren.clear();
 
         SuggestionsSource suggestionsSource = mNewTabPageManager.getSuggestionsSource();
         int[] categories = suggestionsSource.getCategories();
@@ -341,11 +361,7 @@ public class NewTabPageAdapter
     }
 
     public int getFirstHeaderPosition() {
-        int count = getItemCount();
-        for (int i = 0; i < count; i++) {
-            if (getItemViewType(i) == ItemViewType.HEADER) return i;
-        }
-        return RecyclerView.NO_POSITION;
+        return getFirstPositionForType(ItemViewType.HEADER);
     }
 
     public int getFirstCardPosition() {
@@ -355,10 +371,6 @@ public class NewTabPageAdapter
         return RecyclerView.NO_POSITION;
     }
 
-    public int getFooterPosition() {
-        return getChildPositionOffset(mFooter);
-    }
-
     public int getBottomSpacerPosition() {
         return getChildPositionOffset(mBottomSpacer);
     }
@@ -409,17 +421,27 @@ public class NewTabPageAdapter
         notifyDataSetChanged();
     }
 
+    private void updateAllDismissedVisibility() {
+        boolean showAllDismissed = hasAllBeenDismissed();
+        if (showAllDismissed == mChildren.contains(mAllDismissed)) return;
+
+        if (showAllDismissed) {
+            assert mChildren.contains(mFooter);
+            mChildren.set(mChildren.indexOf(mFooter), mAllDismissed);
+        } else {
+            assert mChildren.contains(mAllDismissed);
+            mChildren.set(mChildren.indexOf(mAllDismissed), mFooter);
+        }
+        notifyItemChanged(getLastContentItemPosition());
+    }
+
     private void removeSection(SuggestionsSection section) {
         mSections.remove(section.getCategory());
         int startPos = getChildPositionOffset(section);
         mChildren.remove(section);
         notifyItemRangeRemoved(startPos, section.getItemCount());
 
-        if (hasAllBeenDismissed()) {
-            int footerPosition = getFooterPosition();
-            mChildren.set(mChildren.indexOf(mFooter), mAllDismissed);
-            notifyItemChanged(footerPosition);
-        }
+        updateAllDismissedVisibility();
 
         notifyItemChanged(getBottomSpacerPosition());
     }
@@ -427,24 +449,25 @@ public class NewTabPageAdapter
     @Override
     public void onItemRangeChanged(TreeNode child, int itemPosition, int itemCount) {
         assert child == mRoot;
-        if (mChildren.isEmpty()) return; // The sections have not been initialised yet.
         notifyItemRangeChanged(itemPosition, itemCount);
     }
 
     @Override
     public void onItemRangeInserted(TreeNode child, int itemPosition, int itemCount) {
         assert child == mRoot;
-        if (mChildren.isEmpty()) return; // The sections have not been initialised yet.
         notifyItemRangeInserted(itemPosition, itemCount);
         notifyItemChanged(getItemCount() - 1); // Refresh the spacer too.
+
+        updateAllDismissedVisibility();
     }
 
     @Override
     public void onItemRangeRemoved(TreeNode child, int itemPosition, int itemCount) {
         assert child == mRoot;
-        if (mChildren.isEmpty()) return; // The sections have not been initialised yet.
         notifyItemRangeRemoved(itemPosition, itemCount);
         notifyItemChanged(getItemCount() - 1); // Refresh the spacer too.
+
+        updateAllDismissedVisibility();
     }
 
     @Override
@@ -492,6 +515,7 @@ public class NewTabPageAdapter
     }
 
     private void dismissSection(SuggestionsSection section) {
+        assert SnippetsConfig.isSectionDismissalEnabled();
         mNewTabPageManager.getSuggestionsSource().dismissCategory(section.getCategory());
         removeSection(section);
     }
@@ -517,12 +541,6 @@ public class NewTabPageAdapter
     private void dismissPromo() {
         // TODO(dgn): accessibility announcement.
         mSigninPromo.dismiss();
-
-        if (hasAllBeenDismissed()) {
-            int footerPosition = getFooterPosition();
-            mChildren.set(mChildren.indexOf(mFooter), mAllDismissed);
-            notifyItemChanged(footerPosition);
-        }
     }
 
     /**
@@ -567,6 +585,15 @@ public class NewTabPageAdapter
         return mRoot.getSuggestionAt(position);
     }
 
+    @VisibleForTesting
+    int getFirstPositionForType(@ItemViewType int viewType) {
+        int count = getItemCount();
+        for (int i = 0; i < count; i++) {
+            if (getItemViewType(i) == viewType) return i;
+        }
+        return RecyclerView.NO_POSITION;
+    }
+
     private void announceItemRemoved(String suggestionTitle) {
         // In tests the RecyclerView can be null.
         if (mRecyclerView == null) return;

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

@@ -11,6 +11,7 @@ import android.support.annotation.StringRes;
 import android.support.v7.widget.RecyclerView;
 
 import org.chromium.base.ContextUtils;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ntp.NewTabPage.DestructionObserver;
@@ -125,7 +126,7 @@ public class SignInPromo extends ChildNode implements StatusCardViewHolder.DataS
     }
 
     /** Attempts to show the sign in promo. If the user dismissed it before, it will not be shown.*/
-    public void maybeShow() {
+    private void maybeShow() {
         if (mVisible) return;
         mVisible = true;
 
@@ -136,7 +137,7 @@ public class SignInPromo extends ChildNode implements StatusCardViewHolder.DataS
     }
 
     /** Hides the sign in promo. */
-    public void hide() {
+    private void hide() {
         if (!mVisible) return;
         mVisible = false;
 
@@ -154,7 +155,8 @@ public class SignInPromo extends ChildNode implements StatusCardViewHolder.DataS
         mObserver.unregister();
     }
 
-    private class SigninObserver
+    @VisibleForTesting
+    class SigninObserver
             implements SignInStateObserver, SignInAllowedObserver, DestructionObserver {
         private final SigninManager mSigninManager;
         private final NewTabPageAdapter mAdapter;

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/FakeSuggestionsSource.java

@@ -97,7 +97,7 @@ public class FakeSuggestionsSource implements SuggestionsSource {
 
     @Override
     public void dismissCategory(@CategoryInt int category) {
-        throw new UnsupportedOperationException();
+        silentlyRemoveCategory(category);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsConfig.java

@@ -4,25 +4,44 @@
 
 package org.chromium.chrome.browser.ntp.snippets;
 
+import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 
+import java.util.Set;
+
 /**
  * Provides configuration details for NTP snippets.
  */
 public final class SnippetsConfig {
+    /** Map that stores substitution feature flags for tests. */
+    private static Set<String> sTestEnabledFeatures;
     private SnippetsConfig() {}
 
+    /**
+     * Sets the feature flags to use in JUnit tests, since native calls are not available there.
+     * Note: Always set it back to {@code null} at the end of the test!
+     */
+    @VisibleForTesting
+    public static void setTestEnabledFeatures(Set<String> featureList) {
+        sTestEnabledFeatures = featureList;
+    }
+
     public static boolean isEnabled() {
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS);
+        return isFeatureEnabled(ChromeFeatureList.NTP_SNIPPETS);
     }
 
     public static boolean isSaveToOfflineEnabled() {
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SNIPPETS_SAVE_TO_OFFLINE)
+        return isFeatureEnabled(ChromeFeatureList.NTP_SNIPPETS_SAVE_TO_OFFLINE)
                 && OfflinePageBridge.isBackgroundLoadingEnabled();
     }
 
     public static boolean isSectionDismissalEnabled() {
-        return ChromeFeatureList.isEnabled(ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL);
+        return isFeatureEnabled(ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL);
+    }
+
+    private static boolean isFeatureEnabled(String feature) {
+        if (sTestEnabledFeatures == null) return ChromeFeatureList.isEnabled(feature);
+        return sTestEnabledFeatures.contains(feature);
     }
 }