Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/views/infobars/infobar_view.cc

Index: trunk/src/chrome/browser/ui/views/infobars/infobar_view.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/infobars/infobar_view.cc	(revision 238401)
+++ trunk/src/chrome/browser/ui/views/infobars/infobar_view.cc	(working copy)
@@ -54,8 +54,8 @@
 const int InfoBarView::kEndOfLabelSpacing = 16;
 const int InfoBarView::kHorizontalPadding = 6;
 
-InfoBarView::InfoBarView(scoped_ptr<InfoBarDelegate> delegate)
-    : InfoBar(delegate.Pass()),
+InfoBarView::InfoBarView(InfoBarService* owner, InfoBarDelegate* delegate)
+    : InfoBar(owner, delegate),
       views::ExternalFocusTracker(this, NULL),
       icon_(NULL),
       close_button_(NULL) {
@@ -376,9 +376,11 @@
 }
 
 void InfoBarView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->name = l10n_util::GetStringUTF16(
-      (delegate()->GetInfoBarType() == InfoBarDelegate::WARNING_TYPE) ?
-          IDS_ACCNAME_INFOBAR_WARNING : IDS_ACCNAME_INFOBAR_PAGE_ACTION);
+  if (delegate()) {
+    state->name = l10n_util::GetStringUTF16(
+        (delegate()->GetInfoBarType() == InfoBarDelegate::WARNING_TYPE) ?
+            IDS_ACCNAME_INFOBAR_WARNING : IDS_ACCNAME_INFOBAR_PAGE_ACTION);
+  }
   state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }