Revert 50913...

chrome/browser/translate/translate_manager2_unittest.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/renderer_host/test/test_render_view_host.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/renderer_host/mock_render_process_host.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
@@ skipping 285 matching lines @@
 
   // Simulate the render notifying the translation has been done.
   rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en",
       TranslateErrors::NONE));
 
   // The after translate infobar should be showing.
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(TranslateInfoBarDelegate2::AFTER_TRANSLATE, infobar->type());
 
-  // Simulate changing the original language, this should trigger a translation.
+  // Simulate translating again from there but with 2 different languages.
+  infobar->SetOriginalLanguage(0);
+  infobar->SetTargetLanguage(1);
+  std::string new_original_lang = infobar->GetOriginalLanguageCode();
+  std::string new_target_lang = infobar->GetTargetLanguageCode();
   process()->sink().ClearMessages();
-  std::string new_original_lang = infobar->GetLanguageCodeAt(0);
-  infobar->SetOriginalLanguage(0);
-  EXPECT_TRUE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
-  EXPECT_EQ(0, page_id);
-  EXPECT_EQ(new_original_lang, original_lang);
-  EXPECT_EQ("en", target_lang);
-  // Simulate the render notifying the translation has been done.
-  rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0,
-      new_original_lang, "en", TranslateErrors::NONE));
-  // infobar is now invalid.
-  TranslateInfoBarDelegate2* new_infobar = GetTranslateInfoBar();
-  ASSERT_TRUE(new_infobar != NULL);
-  EXPECT_NE(infobar, new_infobar);
-  infobar = new_infobar;
+  infobar->Translate();
 
-  // Simulate changing the target language, this should trigger a translation.
-  process()->sink().ClearMessages();
-  std::string new_target_lang = infobar->GetLanguageCodeAt(1);
-  infobar->SetTargetLanguage(1);
+  // Test that we sent the right message to the renderer.
   EXPECT_TRUE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   EXPECT_EQ(0, page_id);
   EXPECT_EQ(new_original_lang, original_lang);
   EXPECT_EQ(new_target_lang, target_lang);
-  // Simulate the render notifying the translation has been done.
-  rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0,
-      new_original_lang, new_target_lang, TranslateErrors::NONE));
-  // infobar is now invalid.
-  new_infobar = GetTranslateInfoBar();
-  ASSERT_TRUE(new_infobar != NULL);
-  EXPECT_NE(infobar, new_infobar);
 }
 
 TEST_F(TranslateManager2Test, TranslateScriptNotAvailable) {
   // Simulate navigating to a page.
   SimulateNavigation(GURL("http://www.google.fr"), 0, "Le Google", "fr");
 
   // We should have an infobar.
   TranslateInfoBarDelegate2* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(TranslateInfoBarDelegate2::BEFORE_TRANSLATE, infobar->type());
@@ skipping 572 matching lines @@
   EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
 
   // Test that the translate context menu is disabled when the page is in the
   // same language as the UI.
   SimulateNavigation(url, 0, "Google", "en");
   menu.reset(TestRenderViewContextMenu::CreateContextMenu(contents()));
   menu->Init();
   EXPECT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_TRANSLATE));
   EXPECT_FALSE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE));
 }