Fix a crash in the translate info bar.

chrome/browser/translate/translate_manager.cc

Index: chrome/browser/translate/translate_manager.cc
===================================================================
--- chrome/browser/translate/translate_manager.cc	(revision 95783)
+++ chrome/browser/translate/translate_manager.cc	(working copy)
@@ -507,7 +507,7 @@
   // Prompts the user if he/she wants the page translated.
   wrapper->AddInfoBar(TranslateInfoBarDelegate::CreateDelegate(
       TranslateInfoBarDelegate::BEFORE_TRANSLATE, tab, language_code,
-          target_lang));
+      target_lang));
 }
 
 void TranslateManager::InitiateTranslationPosted(
@@ -534,17 +534,9 @@
     return;
   }
 
-  TranslateInfoBarDelegate* infobar = TranslateInfoBarDelegate::CreateDelegate(
+  ShowInfoBar(tab_contents, TranslateInfoBarDelegate::CreateDelegate(
       TranslateInfoBarDelegate::TRANSLATING, tab_contents,
-      source_lang, target_lang);
-  if (!infobar) {
-    // This means the source or target languages are not supported, which should
-    // not happen as we won't show a translate infobar or have the translate
-    // context menu activated in such cases.
-    NOTREACHED();
-    return;
-  }
-  ShowInfoBar(tab_contents, infobar);
+      source_lang, target_lang));
 
   if (!translate_script_.empty()) {
     DoTranslatePage(tab_contents, translate_script_, source_lang, target_lang);
@@ -750,6 +742,7 @@
 void TranslateManager::ShowInfoBar(TabContents* tab,
                                    TranslateInfoBarDelegate* infobar) {
   TranslateInfoBarDelegate* old_infobar = GetTranslateInfoBarDelegate(tab);
+  DCHECK(infobar != NULL);

[Peter Kasting, 2011/08/08 22:09:49]

Nit: Move this to top of function ("precondition")

[MAD, 2011/08/09 14:19:41]

Done.

   infobar->UpdateBackgroundAnimation(old_infobar);
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
@@ -781,8 +774,9 @@
   std::vector<std::string>::iterator iter;
   for (iter = accept_langs_list.begin();
        iter != accept_langs_list.end(); ++iter) {
-    if (IsSupportedLanguage(GetLanguageCode(*iter)))
-      return *iter;
+    std::string lang_code = GetLanguageCode(*iter);
+    if (IsSupportedLanguage(lang_code))
+      return lang_code;
   }
   return std::string();
 }