Simplify the translate infobar code some.

chrome/browser/ui/gtk/infobars/translate_infobar_base_gtk.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/gtk/infobars/translate_infobar_base_gtk.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
@@ skipping 126 matching lines @@
 }
 
 GtkWidget* TranslateInfoBarBase::CreateLanguageCombobox(
     size_t selected_language,
     size_t exclude_language) {
   GtkListStore* model = gtk_list_store_new(LANGUAGE_COMBO_COLUMN_COUNT,
                                            G_TYPE_INT, G_TYPE_STRING);
   bool set_selection = false;
   GtkTreeIter selected_iter;
   TranslateInfoBarDelegate* delegate = GetDelegate();
-  for (size_t i = 0; i < delegate->GetLanguageCount(); ++i) {
+  for (size_t i = 0; i < delegate->num_languages(); ++i) {
     if (i == exclude_language)
       continue;
     GtkTreeIter tree_iter;
-    const string16& name = delegate->GetLanguageDisplayableNameAt(i);
+    const string16& name = delegate->language_name_at(i);
 
     gtk_list_store_append(model, &tree_iter);
     gtk_list_store_set(model, &tree_iter,
                        LANGUAGE_COMBO_COLUMN_ID, i,
                        LANGUAGE_COMBO_COLUMN_NAME, UTF16ToUTF8(name).c_str(),
                        -1);
     if (i == selected_language) {
       selected_iter = tree_iter;
       set_selection = true;
     }
@@ skipping 46 matching lines @@
     case TRANSLATING:
     case TRANSLATION_ERROR:
       infobar = new TranslateMessageInfoBar(helper, this);
       break;
     default:
       NOTREACHED();
   }
   infobar->Init();
   return infobar;
 }