Infobar system refactor.

This changes the ownership model of infobars so that InfoBars are long-lived and
own their InfoBarDelegates directly.  The InfoBarService pseudo-owns the
InfoBars (instead of deleting them directly, it tells them when they're unowned
and expects them to delete themselves).

This fixes leaks when infobars are closed while not visible (e.g. in a
background tab) and in general makes the system clearer and easier to reason
about.

BUG=62154
TEST=none
R=erg@chromium.org, sail@chromium.org, sky@chromium.org

Review URL: https://codereview.chromium.org/22694006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238283 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/infobars/simple_alert_infobar_delegate.cc b/chrome/browser/infobars/simple_alert_infobar_delegate.cc
index 6e8b82c..0c092f2 100644
--- a/chrome/browser/infobars/simple_alert_infobar_delegate.cc
+++ b/chrome/browser/infobars/simple_alert_infobar_delegate.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
 
+#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
@@ -12,17 +13,16 @@ void SimpleAlertInfoBarDelegate::Create(InfoBarService* infobar_service,
                                         int icon_id,
                                         const string16& message,
                                         bool auto_expire) {
-  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
-      new SimpleAlertInfoBarDelegate(infobar_service, icon_id, message,
-                                     auto_expire)));
+  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate>(
+          new SimpleAlertInfoBarDelegate(icon_id, message, auto_expire))));
 }
 
 SimpleAlertInfoBarDelegate::SimpleAlertInfoBarDelegate(
-    InfoBarService* infobar_service,
     int icon_id,
     const string16& message,
     bool auto_expire)
-    : ConfirmInfoBarDelegate(infobar_service),
+    : ConfirmInfoBarDelegate(),
       icon_id_(icon_id),
       message_(message),
       auto_expire_(auto_expire) {