Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/auto_login_infobar_delegate.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/auto_login_infobar_delegate.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/ubertoken_fetcher.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 94 matching lines @@
 }
 
 }  // namespace
 
 
 // AutoLoginInfoBarDelegate ---------------------------------------------------
 
 // static
 void AutoLoginInfoBarDelegate::Create(InfoBarService* infobar_service,
                                       const Params& params) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
 #if defined(OS_ANDROID)
-      new AutoLoginInfoBarDelegateAndroid(params)
+      new AutoLoginInfoBarDelegateAndroid(infobar_service, params)
 #else
-      new AutoLoginInfoBarDelegate(params)
+      new AutoLoginInfoBarDelegate(infobar_service, params)
 #endif
-      )));
+      ));
 }
 
-AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(const Params& params)
-    : ConfirmInfoBarDelegate(),
+AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(
+    InfoBarService* owner,
+    const Params& params)
+    : ConfirmInfoBarDelegate(owner),
       params_(params),
       button_pressed_(false) {
   RecordHistogramAction(SHOWN);
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
                  content::Source<Profile>(Profile::FromBrowserContext(
                      web_contents()->GetBrowserContext())));
 }
 
 AutoLoginInfoBarDelegate::~AutoLoginInfoBarDelegate() {
   if (!button_pressed_)
@@ skipping 44 matching lines @@
   RecordHistogramAction(REJECTED);
   button_pressed_ = true;
   return true;
 }
 
 void AutoLoginInfoBarDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, type);
-  infobar()->RemoveSelf();
+  // owner() can be NULL when InfoBarService removes us. See
+  // |InfoBarDelegate::clear_owner|.
+  if (owner())
+    owner()->RemoveInfoBar(this);
 }
 
 void AutoLoginInfoBarDelegate::RecordHistogramAction(Actions action) {
   UMA_HISTOGRAM_ENUMERATION("AutoLogin.Regular", action,
                             HISTOGRAM_BOUNDING_VALUE);
 }