Make TabContents own its infobar delegates....

chrome/browser/ui/views/infobars/after_translate_infobar.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/views/infobars/after_translate_infobar.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
@@ skipping 99 matching lines @@
 void AfterTranslateInfoBar::OriginalLanguageChanged() {
   UpdateLanguageButtonText(LanguagesMenuModel::ORIGINAL);
 }
 
 void AfterTranslateInfoBar::TargetLanguageChanged() {
   UpdateLanguageButtonText(LanguagesMenuModel::TARGET);
 }
 
 void AfterTranslateInfoBar::ButtonPressed(views::Button* sender,
                                           const views::Event& event) {
-  if (sender == revert_button_) {
+  if (delegate() && (sender == revert_button_)) {
     GetDelegate()->RevertTranslation();
     return;
   }
+
   TranslateInfoBarBase::ButtonPressed(sender, event);
 }
 
 void AfterTranslateInfoBar::RunMenu(views::View* source,
                                     const gfx::Point& pt) {
+  if (!delegate())
+    return;
+  // TODO(pkasting): What if the InfoBarDelegate is closed while the menu is
+  // open?  Then the menu models may deref garbage delegate pointers.
+
   if (source == original_language_menu_button_) {
     if (!original_language_menu_.get()) {
       original_language_menu_.reset(
           new views::Menu2(&original_language_menu_model_));
     }
     original_language_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   } else if (source == target_language_menu_button_) {
       if (!target_language_menu_.get()) {
         target_language_menu_.reset(
             new views::Menu2(&target_language_menu_model_));
@@ skipping 21 matching lines @@
   }
   string16 language =
       GetDelegate()->GetLanguageDisplayableNameAt(language_index);
   language_button->SetText(UTF16ToWideHack(language));
   // The following line is necessary for the preferred size to be recomputed.
   language_button->ClearMaxTextSize();
   // The button may have to grow to show the new text.
   Layout();
   SchedulePaint();
 }