Change InfoBar-related notifications to be sourced from a TabContentsWrapper, not a TabContents. ...

chrome/browser/ui/views/infobars/after_translate_infobar.cc

 // Copyright (c) 2011 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/after_translate_infobar.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 130 matching lines @@
            original_language_menu_button_->GetPreferredSize().width() +
            kButtonInLabelSpacing) +
       (kButtonInLabelSpacing +
            target_language_menu_button_->GetPreferredSize().width() +
            kButtonInLabelSpacing) +
       (kButtonInLabelSpacing + revert_button_->GetPreferredSize().width()) +
       (kEndOfLabelSpacing + options_menu_button_->GetPreferredSize().width());
 }
 
 void AfterTranslateInfoBar::OriginalLanguageChanged() {
-  UpdateLanguageButtonText(original_language_menu_button_,
-                           LanguagesMenuModel::ORIGINAL);
+  // Tests can call this function when the infobar has never been added to a
+  // view hierarchy and thus there is no button.
+  if (original_language_menu_button_) {
+    UpdateLanguageButtonText(original_language_menu_button_,
+                             LanguagesMenuModel::ORIGINAL);
+  }
 }
 
 void AfterTranslateInfoBar::TargetLanguageChanged() {
-  UpdateLanguageButtonText(target_language_menu_button_,
-                           LanguagesMenuModel::TARGET);
+  // Tests can call this function when the infobar has never been added to a
+  // view hierarchy and thus there is no button.
+  if (target_language_menu_button_) {
+    UpdateLanguageButtonText(target_language_menu_button_,
+                             LanguagesMenuModel::TARGET);
+  }
 }
 
 void AfterTranslateInfoBar::RunMenu(View* source, const gfx::Point& pt) {
   if (source == original_language_menu_button_) {
     original_language_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   } else if (source == target_language_menu_button_) {
     target_language_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   } else {
     DCHECK_EQ(options_menu_button_, source);
     options_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
   }
 }