Redo how AppBannerInfoBars are created and stored

chrome/android/java/src/org/chromium/chrome/browser/Tab.java

Index: chrome/android/java/src/org/chromium/chrome/browser/Tab.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
index a6f9c7a7afd595472f13fe902213a9604e35a933..2f40e2ac61587f5c275e757ee5c70bfae573e45e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/Tab.java
@@ -1228,6 +1228,11 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
                 setContentViewCore(contentViewCore);
             }
 
+            if (AppBannerManager.isEnabled()) {
+                mAppBannerManager = new AppBannerManager(this);
+                addObserver(mAppBannerManager);
+            }
+
             if (!creatingWebContents && webContents.isLoadingToDifferentDocument()) {
                 didStartPageLoad(webContents.getUrl(), false);
             }
@@ -1370,10 +1375,6 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
         }
         mInfoBarContainer.setContentViewCore(mContentViewCore);
 
-        if (AppBannerManager.isEnabled() && mAppBannerManager == null) {
-            mAppBannerManager = new AppBannerManager(this);
-        }
-
         if (DomDistillerFeedbackReporter.isEnabled() && mDomDistillerFeedbackReporter == null) {
             mDomDistillerFeedbackReporter = new DomDistillerFeedbackReporter(this);
         }
@@ -1467,6 +1468,13 @@ public class Tab implements ViewGroup.OnHierarchyChangeListener,
             mInfoBarContainer = null;
         }
 
+        // Destroy the AppBannerManager after the InfoBarContainer because it monitors for infobar
+        // removals.
+        if (mAppBannerManager != null) {
+            mAppBannerManager.destroy();
+            mAppBannerManager = null;
+        }
+
         mPreviousFullscreenTopControlsOffsetY = Float.NaN;
         mPreviousFullscreenContentOffsetY = Float.NaN;