Landing r60095 to the M7 branch....

chrome/browser/autofill/autofill_cc_infobar_delegate.cc

 // Copyright (c) 2010 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/autofill/autofill_cc_infobar_delegate.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/histogram.h"
 #include "chrome/browser/autofill/autofill_cc_infobar.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 AutoFillCCInfoBarDelegate::AutoFillCCInfoBarDelegate(TabContents* tab_contents,
                                                      AutoFillManager* host)
     : ConfirmInfoBarDelegate(tab_contents),
       host_(host) {
-  if (tab_contents)
-    tab_contents->AddInfoBar(this);
 }
 
 AutoFillCCInfoBarDelegate::~AutoFillCCInfoBarDelegate() {
 }
 
 bool AutoFillCCInfoBarDelegate::ShouldExpire(
     const NavigationController::LoadCommittedDetails& details) const {
   // The user has submitted a form, causing the page to navigate elsewhere. We
   // don't want the infobar to be expired at this point, because the user won't
   // get a chance to answer the question.
   return false;
 }
 
 void AutoFillCCInfoBarDelegate::InfoBarClosed() {
   if (host_) {
     host_->OnInfoBarClosed(false);
     host_ = NULL;
   }
-
-  // This will delete us.
-  ConfirmInfoBarDelegate::InfoBarClosed();
+  delete this;
 }
 
 string16 AutoFillCCInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT);
 }
 
 SkBitmap* AutoFillCCInfoBarDelegate::GetIcon() const {
   return ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFOBAR_AUTOFILL);
 }
@@ skipping 41 matching lines @@
                                  NEW_FOREGROUND_TAB, PageTransition::TYPED);
   return false;
 }
 
 #if defined(OS_WIN)
 InfoBar* AutoFillCCInfoBarDelegate::CreateInfoBar() {
   return CreateAutofillCcInfoBar(this);
 }
 #endif  // defined(OS_WIN)