Redo how AppBannerInfoBars are created and stored

chrome/browser/android/banners/app_banner_manager.h

Index: chrome/browser/android/banners/app_banner_manager.h
diff --git a/chrome/browser/android/banners/app_banner_manager.h b/chrome/browser/android/banners/app_banner_manager.h
index 12ae72a3c791e5add2dff3635a96281599a3ce1e..c2c7cb581a0087e73bbd5aac9eb74a2249caba96 100644
--- a/chrome/browser/android/banners/app_banner_manager.h
+++ b/chrome/browser/android/banners/app_banner_manager.h
@@ -10,6 +10,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
+#include "chrome/browser/ui/android/infobars/app_banner_infobar.h"
+#include "components/infobars/core/infobar_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/manifest.h"
 
@@ -19,6 +21,10 @@ struct LoadCommittedDetails;
 struct Manifest;
 }  // namespace content
 
+namespace infobars {
+class InfoBar;
+}  // namspace infobars
+
 /**
  * Manages when an app banner is created or dismissed.
  *
@@ -105,7 +111,9 @@ class AppBannerManager : public chrome::BitmapFetcherDelegate,
 
   // AppBannerInfoBarDelegate::AppDelegate overrides.
   void Block() const override;
-  void Install() const override;
+  bool OnButtonClicked() const override;
+  void OnInfoBarDestroyed() override;
+  base::string16 GetTitle() const override;
   gfx::Image GetIcon() const override;
 
  private:
@@ -128,9 +136,16 @@ class AppBannerManager : public chrome::BitmapFetcherDelegate,
   // Fetches the icon for an app.
   scoped_ptr<chrome::BitmapFetcher> fetcher_;
   GURL validated_url_;
-  content::Manifest manifest_;
+  GURL app_icon_url_;
+
+  base::string16 app_title_;
   scoped_ptr<SkBitmap> app_icon_;
 
+  content::Manifest web_app_data_;
+
+  // Weak pointer to the InfoBar that is being managed.
+  AppBannerInfoBar* weak_infobar_ptr_;
+
   // AppBannerManager on the Java side.
   JavaObjectWeakGlobalRef weak_java_banner_view_manager_;