Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/views/infobars/alternate_nav_infobar_view.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/alternate_nav_infobar_view.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 
 
 // AlternateNavInfoBarDelegate -------------------------------------------------
 
-// static
-scoped_ptr<InfoBar> AlternateNavInfoBarDelegate::CreateInfoBar(
-    scoped_ptr<AlternateNavInfoBarDelegate> delegate) {
-  return scoped_ptr<InfoBar>(new AlternateNavInfoBarView(delegate.Pass()));
+InfoBar* AlternateNavInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new AlternateNavInfoBarView(owner, this);
 }
 
 
 // AlternateNavInfoBarView -----------------------------------------------------
 
 AlternateNavInfoBarView::AlternateNavInfoBarView(
-    scoped_ptr<AlternateNavInfoBarDelegate> delegate)
-    : InfoBarView(delegate.PassAs<InfoBarDelegate>()),
+    InfoBarService* owner,
+    AlternateNavInfoBarDelegate* delegate)
+    : InfoBarView(owner, delegate),
       label_1_(NULL),
       link_(NULL),
       label_2_(NULL) {
 }
 
 AlternateNavInfoBarView::~AlternateNavInfoBarView() {
 }
 
 void AlternateNavInfoBarView::Layout() {
   InfoBarView::Layout();
@@ skipping 44 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();
 }
 
 AlternateNavInfoBarDelegate* AlternateNavInfoBarView::GetDelegate() {
   return static_cast<AlternateNavInfoBarDelegate*>(delegate());
 }