Simplify the translate infobar code some.

chrome/browser/translate/translate_manager_browsertest.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 <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/json/json_writer.h"
@@ skipping 382 matching lines @@
   RenderViewHostTester::TestOnMessageReceived(
       rvh(),
       ChromeViewHostMsg_PageTranslated(
           0, 0, "fr", "en", TranslateErrors::NONE));
 
   // The after translate infobar should be showing.
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(TranslateInfoBarDelegate::AFTER_TRANSLATE, infobar->type());
 
-  // Simulate changing the original language, this should trigger a translation.
+  // Simulate changing the original language and translating.
   process()->sink().ClearMessages();
-  std::string new_original_lang = infobar->GetLanguageCodeAt(0);
-  infobar->SetOriginalLanguage(0);
+  std::string new_original_lang = infobar->language_code_at(0);
+  infobar->set_original_language_index(0);
+  infobar->Translate();
   EXPECT_TRUE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   EXPECT_EQ(new_original_lang, original_lang);
   EXPECT_EQ("en", target_lang);
   // Simulate the render notifying the translation has been done.
   RenderViewHostTester::TestOnMessageReceived(
       rvh(),
       ChromeViewHostMsg_PageTranslated(
           0, 0, new_original_lang, "en", TranslateErrors::NONE));
   // infobar is now invalid.
   TranslateInfoBarDelegate* new_infobar = GetTranslateInfoBar();
   ASSERT_TRUE(new_infobar != NULL);
   infobar = new_infobar;
 
-  // Simulate changing the target language, this should trigger a translation.
+  // Simulate changing the target language and translating.
   process()->sink().ClearMessages();
-  std::string new_target_lang = infobar->GetLanguageCodeAt(1);
-  infobar->SetTargetLanguage(1);
+  std::string new_target_lang = infobar->language_code_at(1);
+  infobar->set_target_language_index(1);
+  infobar->Translate();
   EXPECT_TRUE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   EXPECT_EQ(new_original_lang, original_lang);
   EXPECT_EQ(new_target_lang, target_lang);
   // Simulate the render notifying the translation has been done.
   RenderViewHostTester::TestOnMessageReceived(
       rvh(),
       ChromeViewHostMsg_PageTranslated(
           0, 0, new_original_lang, new_target_lang, TranslateErrors::NONE));
   // infobar is now invalid.
   new_infobar = GetTranslateInfoBar();
   ASSERT_TRUE(new_infobar != NULL);
 
   // Verify reload keeps the same settings.
   ReloadAndWait();
   new_infobar = GetTranslateInfoBar();
   ASSERT_TRUE(new_infobar != NULL);
-  ASSERT_EQ(new_target_lang, infobar->GetTargetLanguageCode());
+  ASSERT_EQ(new_target_lang, infobar->target_language_code());
 }
 
 TEST_F(TranslateManagerTest, TranslateScriptNotAvailable) {
   // Simulate navigating to a page.
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // We should have an infobar.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE, infobar->type());
@@ skipping 43 matching lines @@
   // having detected the page was in a known and supported language.
   RenderViewHostTester::TestOnMessageReceived(
       rvh(),
       ChromeViewHostMsg_PageTranslated(
           0, 0, "fr", "en", TranslateErrors::NONE));
 
   // The after translate infobar should be showing.
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(TranslateInfoBarDelegate::AFTER_TRANSLATE, infobar->type());
-  EXPECT_EQ("fr", infobar->GetOriginalLanguageCode());
-  EXPECT_EQ("en", infobar->GetTargetLanguageCode());
+  EXPECT_EQ("fr", infobar->original_language_code());
+  EXPECT_EQ("en", infobar->target_language_code());
 
   // Let's run the same steps but this time the server detects the page is
   // already in English.
   SimulateNavigation(GURL("http://www.google.com"), "und", true);
   menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents()));
   menu->Init();
   menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE);
   RenderViewHostTester::TestOnMessageReceived(
       rvh(),
       ChromeViewHostMsg_PageTranslated(
@@ skipping 1001 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, TranslateSessionRestore) {
   WebContents* current_web_contents = chrome::GetActiveWebContents(browser());
   content::Source<WebContents> source(current_web_contents);
 
   ui_test_utils::WindowedNotificationObserverWithDetails<std::string>
       fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
                                   source);
   fr_language_detected_signal.Wait();
 }