Revert 238283 "Infobar system refactor."

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

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/infobars/confirm_infobar.h"
 
 #include "base/logging.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 
 
 // ConfirmInfoBarDelegate -----------------------------------------------------
 
-// static
-scoped_ptr<InfoBar> ConfirmInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<ConfirmInfoBarDelegate> delegate) {
-  return scoped_ptr<InfoBar>(new ConfirmInfoBar(delegate.Pass()));
+InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new ConfirmInfoBar(owner, this);
 }
 
 
 // ConfirmInfoBar -------------------------------------------------------------
 
-ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate)
-    : InfoBarView(delegate.PassAs<InfoBarDelegate>()),
+ConfirmInfoBar::ConfirmInfoBar(InfoBarService* owner,
+                               ConfirmInfoBarDelegate* delegate)
+    : InfoBarView(owner, delegate),
       label_(NULL),
       ok_button_(NULL),
       cancel_button_(NULL),
       link_(NULL) {
 }
 
 ConfirmInfoBar::~ConfirmInfoBar() {
 }
 
 void ConfirmInfoBar::Layout() {
@@ skipping 92 matching lines @@
     return;  // We're closing; don't call anything, it might access the owner.
   DCHECK(link_ != NULL);
   DCHECK_EQ(link_, source);
   if (GetDelegate()->LinkClicked(ui::DispositionFromEventFlags(event_flags)))
     RemoveSelf();
 }
 
 ConfirmInfoBarDelegate* ConfirmInfoBar::GetDelegate() {
   return delegate()->AsConfirmInfoBarDelegate();
 }