Change NTPSnippetsBridge to read from ContentSuggestionsService

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

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
index 100bb308b63a19ec680997c499854388907f97c2..ecdd10a659e3279dd04fb5c3dc5b14d39b82e68e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapter.java
@@ -16,7 +16,7 @@ import org.chromium.base.Log;
 import org.chromium.chrome.browser.ntp.NewTabPageLayout;
 import org.chromium.chrome.browser.ntp.NewTabPageUma;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
-import org.chromium.chrome.browser.ntp.snippets.DisabledReason;
+import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCategoryStatus;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticleViewHolder;
 import org.chromium.chrome.browser.ntp.snippets.SnippetHeaderListItem;
@@ -121,7 +121,7 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
         mNewTabPageListItems = new ArrayList<NewTabPageListItem>();
         mWantsSnippets = true;
         mSnippetsBridge = snippetsBridge;
-        mStatusListItem = StatusListItem.create(snippetsBridge.getDisabledReason(), this, manager);
+        mStatusListItem = StatusListItem.create(snippetsBridge.getCategoryStatus(), this, manager);
 
         loadSnippets(new ArrayList<SnippetArticle>());
         mSnippetsBridge.setObserver(this);
@@ -150,11 +150,11 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
     }
 
     @Override
-    public void onDisabledReasonChanged(int disabledReason) {
+    public void onCategoryStatusChanged(int categoryStatus) {
         // Observers should not be registered for that state

[Marc Treib, 2016/07/19 16:21:19]

Not your doing, but: Is this still true when we can get into the
EXPLICITLY_DISABLED state during runtime? (Which can happen now:
https://codereview.chromium.org/2158373002/)

[Philipp Keck, 2016/07/19 16:47:34]

You're right, this can definitely happen. With multi-sections, it can happen
anyway, only the all-sections-disabled is equally rare as the previous
"DisabledReason.EXPLICITLY_DISABLED". And even for that one, it would require
the UI to shut down/unregister the observer before the backend changes state --
I don't have any insights which will occur earlier and we probably shouldn't
rely on anything here and develop the UI such that it can handle anything.

[Marc Treib, 2016/07/20 09:17:38]

Well, can we just remove the assert (or change it to check for the
all-sections-disabled value), or will something else break? If so, then that
needs to be fixed before this can land...

[Philipp Keck, 2016/07/20 13:20:02]

It is unclear whether the Zine UI should just be empty in this case or display
an error card or even be inactive (and we instead show "Bookmarks" and "Recent
tabs"). Until this is clarified, I implemented a temporary error card for the
LOADING_ERROR and CATEGORY_EXPLICITLY_DISABLED case. Both are very rare at the
moment, but we need more clarification on all of this (see comments in PRD)
before we implement the multi-section UI.

As for the assert here, it's meant to check against situations where the UI
thinks the feature is enabled, but the backend thinks it's not. This still makes
sense to check for the #enable-ntp-snippets flag, since that one is only changed
through a Chrome restart. So I changed the assert check here to
ALL_SUGGESTIONS_EXPLICITLY_DISABLED. The CATEGORY_EXPLICITLY_DISABLED case will
then be handled with an error card.

I tested the status card by making
NTPSnippetsStatusService::GetDisabledReasonFromDeps return
DisabledReason::EXPLICITLY_DISABLED.

This is the bug for proper behavior in these cases:
https://bugs.chromium.org/p/chromium/issues/detail?id=629817

-        assert disabledReason != DisabledReason.EXPLICITLY_DISABLED;
+        assert categoryStatus != ContentSuggestionsCategoryStatus.CATEGORY_EXPLICITLY_DISABLED;
 
-        mStatusListItem = StatusListItem.create(disabledReason, this, mNewTabPageManager);
+        mStatusListItem = StatusListItem.create(categoryStatus, this, mNewTabPageManager);
         if (getItemCount() > 4 /* above-the-fold + header + card + spacing */) {
             // We had many items, implies that the service was previously enabled and just
             // transitioned. to a disabled state. We now clear it.
@@ -165,7 +165,11 @@ public class NewTabPageAdapter extends Adapter<NewTabPageViewHolder> implements
             // spacing item coming after it.
         }
 
-        if (disabledReason == DisabledReason.NONE) mWantsSnippets = true;
+        if (categoryStatus == ContentSuggestionsCategoryStatus.INITIALIZING
+                || categoryStatus == ContentSuggestionsCategoryStatus.AVAILABLE
+                || categoryStatus == ContentSuggestionsCategoryStatus.AVAILABLE_LOADING) {
+            mWantsSnippets = true;
+        }
     }
 
     @Override