Fix incorrect tab switcher state for incognito ntp

Add check to shouldCaptureThumbnail that informs the ntp if the cookie
controls state is incorrect.

Bug: 1065391
Change-Id: I6b7fb5e5ce88975e1ebb844f5c402a8540176858
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128311
Commit-Queue: Ehimare Okoyomon <eokoyomon@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755049}

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoCookieControlsManager.java

@@ -46,8 +46,14 @@ public class IncognitoCookieControlsManager
     private final ObserverList<Observer> mObservers = new ObserverList<>();
     private boolean mIsInitialized;
     private boolean mShowCard;
+    private boolean mChecked;
     private @CookieControlsEnforcement int mEnforcement = CookieControlsEnforcement.NO_ENFORCEMENT;
 
+    // State variables for cookie controls at the last UI snapshot
+    private boolean mSnapshotChecked;
+    private @CookieControlsEnforcement int mSnapshotEnforcement =
+            CookieControlsEnforcement.NO_ENFORCEMENT;
+
     /**
      * Initializes the IncognitoCookieControlsManager explicitly.
      */
@@ -90,9 +96,21 @@ public class IncognitoCookieControlsManager
         if (mShowCard) mServiceBridge.updateServiceIfNecessary();
     }
 
+    /**
+     * Tells the caller if the state has changed since the last snaptshot.
+     * @return whether a new snapshot should be captured or not.
+     */
+    protected boolean shouldCaptureThumbnail() {
+        boolean changed = mSnapshotEnforcement != mEnforcement || mSnapshotChecked != mChecked;
+        mSnapshotChecked = mChecked;
+        mSnapshotEnforcement = mEnforcement;
+        return changed;
+    }
+
     @Override
     public void sendCookieControlsUIChanges(
             boolean checked, @CookieControlsEnforcement int enforcement) {
+        mChecked = checked;
         mEnforcement = enforcement;
         for (Observer obs : mObservers) {
             obs.onUpdate(checked, enforcement);

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPage.java

@@ -98,6 +98,11 @@ public class IncognitoNewTabPage
                 mCookieControlsManager.updateIfNecessary();
             }
 
+            @Override
+            public boolean shouldCaptureThumbnail() {
+                return mCookieControlsManager.shouldCaptureThumbnail();
+            }
+
             @Override
             public void destroy() {
                 if (mCookieControlsManager != null) {

chrome/android/java/src/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java

@@ -41,6 +41,11 @@ public class IncognitoNewTabPageView extends FrameLayout {
          * */
         void initCookieControlsManager();
 
+        /**
+         * Tells the caller whether a new snapshot is required or not.
+         * */
+        boolean shouldCaptureThumbnail();
+
         /**
          * Cleans up the manager after it is finished being used.
          * */
@@ -113,9 +118,8 @@ public class IncognitoNewTabPageView extends FrameLayout {
     boolean shouldCaptureThumbnail() {
         if (getWidth() == 0 || getHeight() == 0) return false;
 
-        return getWidth() != mSnapshotWidth
-                || getHeight() != mSnapshotHeight
-                || mScrollView.getScrollY() != mSnapshotScrollY;
+        return mManager.shouldCaptureThumbnail() || getWidth() != mSnapshotWidth
+                || getHeight() != mSnapshotHeight || mScrollView.getScrollY() != mSnapshotScrollY;
     }
 
     /**