Redo how AppBannerInfoBars are created and stored

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser;
 
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ skipping 1223 matching lines @@
         } finally {
             if (mTimestampMillis == INVALID_TIMESTAMP) {
                 mTimestampMillis = System.currentTimeMillis();
             }
 
             TraceEvent.end("Tab.initialize");
         }
     }
 
     /**
-     * Perform any subclass-specific initialization tasks.
+     * Perform any class-specific initialization tasks.
      * @param tabContentManager A {@link TabContentManager} instance or {@code null} if the web
      *                          content will be managed/displayed manually.
      */
     protected void internalInit(TabContentManager tabContentManager) {
         initializeNative();
+
+        if (AppBannerManager.isEnabled()) {
+            mAppBannerManager = new AppBannerManager(this);
+            addObserver(mAppBannerManager);
+        }
     }
 
     /**
      * Called when a page has started loading.
      * @param validatedUrl URL being loaded.
      * @param showingErrorPage Whether an error page is being shown.
      */
     protected void didStartPageLoad(String validatedUrl, boolean showingErrorPage) {
         mIsShowingErrorPage = showingErrorPage;
 
@@ skipping 103 matching lines @@
             // The InfoBarContainer needs to be created after the ContentView has been natively
             // initialized.
             WebContents webContents = mContentViewCore.getWebContents();
             mInfoBarContainer = new InfoBarContainer(
                     mContext, getId(), mContentViewParent, webContents, this);
         } else {
             mInfoBarContainer.onParentViewChanged(getId(), mContentViewParent);
         }
         mInfoBarContainer.setContentViewCore(mContentViewCore);
 
-        if (AppBannerManager.isEnabled() && mAppBannerManager == null) {
-            mAppBannerManager = new AppBannerManager(this);
-        }
-
         if (DomDistillerFeedbackReporter.isEnabled() && mDomDistillerFeedbackReporter == null) {
             mDomDistillerFeedbackReporter = new DomDistillerFeedbackReporter(this);
         }
 
         for (TabObserver observer : mObservers) observer.onContentChanged(this);
 
         // For browser tabs, we want to set accessibility focus to the page
         // when it loads. This is not the default behavior for embedded
         // web views.
         mContentViewCore.setShouldSetAccessibilityFocusOnPageLoad(true);
@@ skipping 73 matching lines @@
         // expects all infobars to be cleaned up before its own destruction.
         assert mNativeTabAndroid != 0;
         nativeDestroy(mNativeTabAndroid);
         assert mNativeTabAndroid == 0;
 
         if (mInfoBarContainer != null) {
             mInfoBarContainer.destroy();
             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;
 
         mNeedsReload = false;
     }
 
     /**
      * @return Whether or not this Tab has a live native component.
      */
     public boolean isInitialized() {
@@ skipping 898 matching lines @@
     private native boolean nativePrint(long nativeTabAndroid);
     private native Bitmap nativeGetFavicon(long nativeTabAndroid);
     private native void nativeCreateHistoricalTab(long nativeTabAndroid);
     private native void nativeUpdateTopControlsState(
             long nativeTabAndroid, int constraints, int current, boolean animate);
     private native void nativeSearchByImageInNewTabAsync(long nativeTabAndroid);
     private native void nativeSetInterceptNavigationDelegate(long nativeTabAndroid,
             InterceptNavigationDelegate delegate);
     private static native void nativeRecordStartupToCommitUma();
 }