[NTP Client] Make the SignInPromo update on SignInAllowed changes

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

Index: chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
index 2d31743e17147960433e0a28382cbcdc4c75c916..d1bcd9104a473947fbbd6cfa526dafc25adbb8db 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
@@ -44,6 +44,7 @@
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
 import org.chromium.chrome.browser.ntp.LogoBridge.LogoObserver;
 import org.chromium.chrome.browser.ntp.MostVisitedItem;
+import org.chromium.chrome.browser.ntp.NewTabPage.SelfRegistrable;
 import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
@@ -55,6 +56,7 @@
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
 import org.chromium.chrome.browser.signin.SigninManager;
+import org.chromium.chrome.browser.signin.SigninManager.SignInAllowedObserver;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
@@ -776,10 +778,18 @@ public void testSigninPromo() {
         assertEquals(1, signinPromoGroup.getItemCount());
         assertEquals(ItemViewType.PROMO, signinPromoGroup.getItemViewType(0));
 
-        ntpManager.mSignInStateObserver.onSignedIn();
+        ((SignInStateObserver) ntpManager.mSelfRegistrable).onSignedIn();
         assertEquals(0, signinPromoGroup.getItemCount());
 
-        ntpManager.mSignInStateObserver.onSignedOut();
+        ((SignInStateObserver) ntpManager.mSelfRegistrable).onSignedOut();
+        assertEquals(1, signinPromoGroup.getItemCount());
+
+        when(mMockSigninManager.isSignInAllowed()).thenReturn(false);
+        ((SignInAllowedObserver) ntpManager.mSelfRegistrable).onSignInAllowedChanged();
+        assertEquals(0, signinPromoGroup.getItemCount());
+
+        when(mMockSigninManager.isSignInAllowed()).thenReturn(true);
+        ((SignInAllowedObserver) ntpManager.mSelfRegistrable).onSignInAllowedChanged();
         assertEquals(1, signinPromoGroup.getItemCount());
     }
 
@@ -840,7 +850,7 @@ private int getCategory(TreeNode itemGroup) {
 
     private static class MockNewTabPageManager implements NewTabPageManager {
         SuggestionsSource mSuggestionsSource;
-        SignInStateObserver mSignInStateObserver;
+        SelfRegistrable mSelfRegistrable;
 
         public MockNewTabPageManager(SuggestionsSource suggestionsSource) {
             mSuggestionsSource = suggestionsSource;
@@ -1002,8 +1012,8 @@ public void closeContextMenu() {
         }
 
         @Override
-        public void registerSignInStateObserver(SignInStateObserver signInStateObserver) {
-            mSignInStateObserver = signInStateObserver;
+        public void addSelfRegistrable(SelfRegistrable selfRegistrable) {
+            mSelfRegistrable = selfRegistrable;
         }
 
         @Override