Remove unused Views Translate InfoBar code.

chrome/browser/translate/translate_manager_render_view_host_unittest.cc

 // Copyright 2014 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/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
@@ skipping 229 matching lines @@
     removed_infobars_.insert(
         content::Details<infobars::InfoBar::RemovedDetails>(
             details)->first->delegate());
   }
 
   MOCK_METHOD1(OnPreferenceChanged, void(const std::string&));
 
  protected:
   virtual void SetUp() {
     TranslateService::InitializeForTesting();
-    TranslateService::SetUseInfobar(true);
 
     // Clears the translate script so it is fetched everytime and sets the
     // expiration delay to a large value by default (in case it was zeroed in a
     // previous test).
     TranslateDownloadManager* download_manager =
         TranslateDownloadManager::GetInstance();
     download_manager->ClearTranslateScriptForTesting();
     download_manager->SetTranslateScriptExpirationDelay(60 * 60 * 1000);
 
     ChromeRenderViewHostTestHarness::SetUp();
@@ skipping 134 matching lines @@
   TranslateBubbleModel* model() { return model_.get(); }
 
  private:
   scoped_ptr<TranslateBubbleModel> model_;
 
   DISALLOW_COPY_AND_ASSIGN(MockTranslateBubbleFactory);
 };
 
 
 TEST_F(TranslateManagerRenderViewHostTest, NormalTranslate) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // We should have an infobar.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
             infobar->translate_step());
 
   // Simulate clicking translate.
   process()->sink().ClearMessages();
@@ skipping 60 matching lines @@
   infobar->UpdateTargetLanguageIndex(1);
   infobar->ToggleAlwaysTranslate();
   ReloadAndWait(true);
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(translate::TRANSLATE_STEP_TRANSLATING, infobar->translate_step());
   EXPECT_EQ(new_target_lang, infobar->target_language_code());
 }
 
 TEST_F(TranslateManagerRenderViewHostTest, TranslateScriptNotAvailable) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // We should have an infobar.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
             infobar->translate_step());
 
   // Simulate clicking translate.
   process()->sink().ClearMessages();
   infobar->Translate();
   SimulateTranslateScriptURLFetch(false);
 
   // We should not have sent any message to translate to the renderer.
   EXPECT_FALSE(GetTranslateMessage(NULL, NULL, NULL));
 
   // And we should have an error infobar showing.
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(translate::TRANSLATE_STEP_TRANSLATE_ERROR,
             infobar->translate_step());
 }
 
 // Ensures we deal correctly with pages for which the browser does not recognize
 // the language (the translate server may or not detect the language).
 TEST_F(TranslateManagerRenderViewHostTest, TranslateUnknownLanguage) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   // Simulate navigating to a page ("und" is the string returned by the CLD for
   // languages it does not recognize).
   SimulateNavigation(GURL("http://www.google.mys"), "und", true);
 
   // We should not have an infobar as we don't know the language.
   ASSERT_TRUE(GetTranslateInfoBar() == NULL);
 
   // Translate the page anyway throught the context menu.
   scoped_ptr<TestRenderViewContextMenu> menu(CreateContextMenu());
   menu->Init();
@@ skipping 45 matching lines @@
       2, std::string(), "en", TranslateErrors::UNKNOWN_LANGUAGE);
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(translate::TRANSLATE_STEP_TRANSLATE_ERROR,
             infobar->translate_step());
   EXPECT_EQ(TranslateErrors::UNKNOWN_LANGUAGE, infobar->error_type());
 }
 
 // Tests that we show/don't show an info-bar for the languages.
 TEST_F(TranslateManagerRenderViewHostTest, TestLanguages) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   std::vector<std::string> languages;
   languages.push_back("en");
   languages.push_back("ja");
   languages.push_back("fr");
   languages.push_back("ht");
   languages.push_back("xx");
   languages.push_back("zh");
   languages.push_back("zh-CN");
   languages.push_back("und");
 
@@ skipping 117 matching lines @@
     EXPECT_NE(current_supported_languages.end(),
               std::find(current_supported_languages.begin(),
                         current_supported_languages.end(),
                         lang));
     EXPECT_FALSE(TranslateDownloadManager::IsAlphaLanguage(lang));
   }
 }
 
 // Tests auto-translate on page.
 TEST_F(TranslateManagerRenderViewHostTest, AutoTranslateOnNavigate) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Simulate the user translating.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   infobar->Translate();
   // Simulate the translate script being retrieved.
   SimulateTranslateScriptURLFetch(true);
   SimulateOnPageTranslated("fr", "en");
 
@@ skipping 12 matching lines @@
   // Now navigate to a page in a different language.
   process()->sink().ClearMessages();
   SimulateNavigation(GURL("http://news.google.es"), "es", true);
 
   // This should not have triggered a translate.
   EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
 }
 
 // Tests that multiple OnPageContents do not cause multiple infobars.
 TEST_F(TranslateManagerRenderViewHostTest, MultipleOnPageContents) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Simulate clicking 'Nope' (don't translate).
   EXPECT_TRUE(DenyTranslation());
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 
   // Send a new PageContents, we should not show an infobar.
   SimulateOnTranslateLanguageDetermined("fr", true);
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 
   // Do the same steps but simulate closing the infobar this time.
   SimulateNavigation(GURL("http://www.youtube.fr"), "fr", true);
   EXPECT_TRUE(CloseTranslateInfoBar());
   EXPECT_EQ(0U, infobar_service()->infobar_count());
   SimulateOnTranslateLanguageDetermined("fr", true);
   EXPECT_EQ(0U, infobar_service()->infobar_count());
 }
 
 // Test that reloading the page brings back the infobar if the
 // reload succeeded and does not bring it back the reload fails.
 TEST_F(TranslateManagerRenderViewHostTest, Reload) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // Reload should bring back the infobar if the reload succeeds.
   ReloadAndWait(true);
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // ...But not show it if the reload fails.
   ReloadAndWait(false);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // If we set reload attempts to a high value, we will not see the infobar
   // immediately.
   ChromeTranslateClient::FromWebContents(web_contents())
       ->set_translate_max_reload_attempts(100);
   ReloadAndWait(true);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 }
 
 // Test that reloading the page by way of typing again the URL in the
 // location bar brings back the infobar.
 TEST_F(TranslateManagerRenderViewHostTest, ReloadFromLocationBar) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   GURL url("http://www.google.fr");
   SimulateNavigation(url, "fr", true);
 
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // Create a pending navigation and simulate a page load.  That should be the
   // equivalent of typing the URL again in the location bar.
   NavEntryCommittedObserver nav_observer(web_contents());
   web_contents()->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
   rvh_tester()->SendNavigateWithTransition(
       0, url, content::PAGE_TRANSITION_TYPED);
 
   // Test that we are really getting a same page navigation, the test would be
   // useless if it was not the case.
   const content::LoadCommittedDetails& nav_details =
       nav_observer.load_committed_details();
   EXPECT_TRUE(nav_details.entry != NULL);  // There was a navigation.
   EXPECT_EQ(content::NAVIGATION_TYPE_SAME_PAGE, nav_details.type);
 
   // The TranslateManager class processes the navigation entry committed
   // notification in a posted task; process that task.
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that a closed translate infobar does not reappear when navigating
 // in-page.
 TEST_F(TranslateManagerRenderViewHostTest, CloseInfoBarInPageNavigation) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // Navigate in page, no infobar should be shown.
   SimulateNavigation(GURL("http://www.google.fr/#ref1"), "fr", true);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // Navigate out of page, a new infobar should show.
   SimulateNavigation(GURL("http://www.google.fr/foot"), "fr", true);
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that a closed translate infobar does not reappear when navigating
 // in a subframe. (http://crbug.com/48215)
 TEST_F(TranslateManagerRenderViewHostTest, CloseInfoBarInSubframeNavigation) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // Simulate a sub-frame auto-navigating.
   rvh_tester()->SendNavigateWithTransition(
       1, GURL("http://pub.com"), content::PAGE_TRANSITION_AUTO_SUBFRAME);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // Simulate the user navigating in a sub-frame.
   rvh_tester()->SendNavigateWithTransition(
       2, GURL("http://pub.com"), content::PAGE_TRANSITION_MANUAL_SUBFRAME);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // Navigate out of page, a new infobar should show.
   SimulateNavigation(GURL("http://www.google.fr/foot"), "fr", true);
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that denying translation is sticky when navigating in page.
 TEST_F(TranslateManagerRenderViewHostTest, DenyTranslateInPageNavigation) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Simulate clicking 'Nope' (don't translate).
   EXPECT_TRUE(DenyTranslation());
 
   // Navigate in page, no infobar should be shown.
   SimulateNavigation(GURL("http://www.google.fr/#ref1"), "fr", true);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // Navigate out of page, a new infobar should show.
   SimulateNavigation(GURL("http://www.google.fr/foot"), "fr", true);
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that after translating and closing the infobar, the infobar does not
 // return when navigating in page.
 TEST_F(TranslateManagerRenderViewHostTest,
        TranslateCloseInfoBarInPageNavigation) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Simulate the user translating.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   infobar->Translate();
   // Simulate the translate script being retrieved.
   SimulateTranslateScriptURLFetch(true);
   SimulateOnPageTranslated("fr", "en");
 
   EXPECT_TRUE(CloseTranslateInfoBar());
 
   // Navigate in page, no infobar should be shown.
   SimulateNavigation(GURL("http://www.google.fr/#ref1"), "fr", true);
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // Navigate out of page, a new infobar should show.
   // Note that we navigate to a page in a different language so we don't trigger
   // the auto-translate feature (it would translate the page automatically and
   // the before translate inforbar would not be shown).
   SimulateNavigation(GURL("http://www.google.de"), "de", true);
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that the after translate the infobar still shows when navigating
 // in-page.
 TEST_F(TranslateManagerRenderViewHostTest, TranslateInPageNavigation) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Simulate the user translating.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   infobar->Translate();
   SimulateTranslateScriptURLFetch(true);
   SimulateOnPageTranslated("fr", "en");
   // The after translate infobar is showing.
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
 
   // Navigate out of page, a new infobar should show.
   // See note in TranslateCloseInfoBarInPageNavigation test on why it is
   // important to navigate to a page in a different language for this test.
   SimulateNavigation(GURL("http://www.google.de"), "de", true);
   // The old infobar is gone.
   EXPECT_TRUE(CheckInfoBarRemovedAndReset(infobar));
   // And there is a new one.
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that no translate infobar is shown when navigating to a page in an
 // unsupported language.
 TEST_F(TranslateManagerRenderViewHostTest, CLDReportsUnsupportedPageLanguage) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   // Simulate navigating to a page and getting an unsupported language.
   SimulateNavigation(GURL("http://www.google.com"), "qbz", true);
 
   // No info-bar should be shown.
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 }
 
 // Tests that we deal correctly with unsupported languages returned by the
 // server.
 // The translation server might return a language we don't support.
 TEST_F(TranslateManagerRenderViewHostTest, ServerReportsUnsupportedLanguage) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://mail.google.fr"), "fr", true);
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   process()->sink().ClearMessages();
   infobar->Translate();
   SimulateTranslateScriptURLFetch(true);
   // Simulate the render notifying the translation has been done, but it
   // reports a language we don't support.
   SimulateOnPageTranslated("qbz", "en");
 
@@ skipping 13 matching lines @@
   const IPC::Message* message = process()->sink().GetFirstMessageMatching(
       ChromeViewMsg_RevertTranslation::ID);
   EXPECT_TRUE(message != NULL);
   // And it should have removed the infobar.
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 }
 
 // Tests that no translate infobar is shown and context menu is disabled, when
 // Chrome is in a language that the translate server does not support.
 TEST_F(TranslateManagerRenderViewHostTest, UnsupportedUILanguage) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   std::string original_lang = g_browser_process->GetApplicationLocale();
   SetApplicationLocale("qbz");
 
   // Make sure that the accept language list only contains unsupported languages
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   prefs->SetString(prefs::kAcceptLanguages, "qbz");
 
   // Simulate navigating to a page in a language supported by the translate
   // server.
   SimulateNavigation(GURL("http://www.google.com"), "en", true);
 
   // No info-bar should be shown.
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // And the context menu option should be disabled too.
   scoped_ptr<TestRenderViewContextMenu> menu(CreateContextMenu());
   menu->Init();
   EXPECT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_TRANSLATE));
   EXPECT_FALSE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE));
 
   SetApplicationLocale(original_lang);
 }
 
 // Tests that the first supported accept language is selected
 TEST_F(TranslateManagerRenderViewHostTest, TranslateAcceptLanguage) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   // Set locate to non-existant language
   std::string original_lang = g_browser_process->GetApplicationLocale();
   SetApplicationLocale("qbz");
 
   // Set Qbz and French as the only accepted languages
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   prefs->SetString(prefs::kAcceptLanguages, "qbz,fr");
 
@@ skipping 10 matching lines @@
 
   // Go to a German page
   SimulateNavigation(GURL("http://google.de"), "de", true);
 
   // Expect the infobar to pop up
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests that the translate enabled preference is honored.
 TEST_F(TranslateManagerRenderViewHostTest, TranslateEnabledPref) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   // Make sure the pref allows translate.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   prefs->SetBoolean(prefs::kEnableTranslate, true);
 
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // An infobar should be shown.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
@@ skipping 10 matching lines @@
 
   // Simulate getting the page contents and language, that should not trigger
   // a translate infobar.
   SimulateOnTranslateLanguageDetermined("fr", true);
   infobar = GetTranslateInfoBar();
   EXPECT_TRUE(infobar == NULL);
 }
 
 // Tests the "Never translate <language>" pref.
 TEST_F(TranslateManagerRenderViewHostTest, NeverTranslateLanguagePref) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   GURL url("http://www.google.fr");
   SimulateNavigation(url, "fr", true);
 
   // An infobar should be shown.
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 
   // Select never translate this language.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
@@ skipping 29 matching lines @@
 
   // Navigate to a page in French.
   SimulateNavigation(url, "fr", true);
 
   // There should be a translate infobar.
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests the "Never translate this site" pref.
 TEST_F(TranslateManagerRenderViewHostTest, NeverTranslateSitePref) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   GURL url("http://www.google.fr");
   std::string host(url.host());
   SimulateNavigation(url, "fr", true);
 
   // An infobar should be shown.
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 
   // Select never translate this site.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
@@ skipping 28 matching lines @@
 
   // Navigate to a page in French.
   SimulateNavigation(url, "fr", true);
 
   // There should be a translate infobar.
   EXPECT_TRUE(GetTranslateInfoBar() != NULL);
 }
 
 // Tests the "Always translate this language" pref.
 TEST_F(TranslateManagerRenderViewHostTest, AlwaysTranslateLanguagePref) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   // Select always translate French to English.
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   PrefChangeRegistrar registrar;
   registrar.Init(prefs);
   registrar.Add(TranslatePrefs::kPrefTranslateWhitelists, pref_callback_);
   scoped_ptr<TranslatePrefs> translate_prefs(
       ChromeTranslateClient::CreateTranslatePrefs(prefs));
   SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateWhitelists);
@@ skipping 40 matching lines @@
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
   EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   EXPECT_EQ(translate::TRANSLATE_STEP_BEFORE_TRANSLATE,
             infobar->translate_step());
 }
 
 // Context menu.
 TEST_F(TranslateManagerRenderViewHostTest, ContextMenu) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   // Blacklist www.google.fr and French for translation.
   GURL url("http://www.google.fr");
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   scoped_ptr<TranslatePrefs> translate_prefs(
       ChromeTranslateClient::CreateTranslatePrefs(profile->GetPrefs()));
   translate_prefs->BlockLanguage("fr");
   translate_prefs->BlacklistSite(url.host());
   EXPECT_TRUE(translate_prefs->IsBlockedLanguage("fr"));
   EXPECT_TRUE(translate_prefs->IsSiteBlacklisted(url.host()));
@@ skipping 88 matching lines @@
   menu.reset(CreateContextMenu());
   menu->Init();
   EXPECT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_TRANSLATE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE));
 }
 
 // Tests that an extra always/never translate button is shown on the "before
 // translate" infobar when the translation is accepted/declined 3 times,
 // only when not in incognito mode.
 TEST_F(TranslateManagerRenderViewHostTest, BeforeTranslateExtraButtons) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   scoped_ptr<TranslatePrefs> translate_prefs(
       ChromeTranslateClient::CreateTranslatePrefs(profile->GetPrefs()));
   translate_prefs->ResetTranslationAcceptedCount("fr");
   translate_prefs->ResetTranslationDeniedCount("fr");
   translate_prefs->ResetTranslationAcceptedCount("de");
   translate_prefs->ResetTranslationDeniedCount("de");
 
   // We'll do 4 times in incognito mode first to make sure the button is not
@@ skipping 59 matching lines @@
   EXPECT_TRUE(translate_prefs->IsBlockedLanguage("de"));
   // No translation should have occured and the infobar should be gone.
   EXPECT_FALSE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   process()->sink().ClearMessages();
   ASSERT_TRUE(GetTranslateInfoBar() == NULL);
 }
 
 // Tests that we don't show a translate infobar when a page instructs that it
 // should not be translated.
 TEST_F(TranslateManagerRenderViewHostTest, NonTranslatablePage) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   SimulateNavigation(GURL("http://mail.google.fr"), "fr", false);
 
   // We should not have an infobar.
   EXPECT_TRUE(GetTranslateInfoBar() == NULL);
 
   // The context menu is enabled to allow users to force translation.
   scoped_ptr<TestRenderViewContextMenu> menu(CreateContextMenu());
   menu->Init();
   EXPECT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_TRANSLATE));
   EXPECT_TRUE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE));
 }
 
 // Tests that the script is expired and refetched as expected.
 TEST_F(TranslateManagerRenderViewHostTest, ScriptExpires) {
+  // This test only applies to the infobar translate UX, not the new bubble UX.
+  if (TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   ExpireTranslateScriptImmediately();
 
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar != NULL);
   process()->sink().ClearMessages();
   infobar->Translate();
   SimulateTranslateScriptURLFetch(true);
   SimulateOnPageTranslated("fr", "en");
 
@@ skipping 20 matching lines @@
   EXPECT_EQ("en", target_lang);
 }
 
 TEST_F(TranslateManagerRenderViewHostTest, DownloadsAndHistoryNotTranslated) {
   ASSERT_FALSE(
       TranslateService::IsTranslatableURL(GURL(chrome::kChromeUIDownloadsURL)));
   ASSERT_FALSE(
       TranslateService::IsTranslatableURL(GURL(chrome::kChromeUIHistoryURL)));
 }
 
-#if defined(USE_AURA)
+TEST_F(TranslateManagerRenderViewHostTest, BubbleNormalTranslate) {
+  // This test only applies to the bubble transle UX, not the old infobar UX.
+  if (!TranslateService::IsTranslateBubbleEnabled())
+    return;
 
-TEST_F(TranslateManagerRenderViewHostTest, BubbleNormalTranslate) {
-  // Prepare for the bubble
-  TranslateService::SetUseInfobar(false);
   MockTranslateBubbleFactory* factory = new MockTranslateBubbleFactory;
   scoped_ptr<TranslateBubbleFactory> factory_ptr(factory);
   TranslateBubbleFactory::SetFactory(factory);
 
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Check the bubble exists instead of the infobar.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar == NULL);
   TranslateBubbleModel* bubble = factory->model();
@@ skipping 19 matching lines @@
   SimulateOnPageTranslated("fr", "en");
 
   // Check the bubble shows "Translated."
   bubble = factory->model();
   ASSERT_TRUE(bubble != NULL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_AFTER_TRANSLATE,
             bubble->GetViewState());
 }
 
 TEST_F(TranslateManagerRenderViewHostTest, BubbleTranslateScriptNotAvailable) {
-  // Prepare for the bubble
-  TranslateService::SetUseInfobar(false);
+  // This test only applies to the bubble transle UX, not the old infobar UX.
+  if (!TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   MockTranslateBubbleFactory* factory = new MockTranslateBubbleFactory;
   scoped_ptr<TranslateBubbleFactory> factory_ptr(factory);
   TranslateBubbleFactory::SetFactory(factory);
 
   SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
 
   // Check the bubble exists instead of the infobar.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar == NULL);
   TranslateBubbleModel* bubble = factory->model();
   ASSERT_TRUE(bubble != NULL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
             bubble->GetViewState());
 
   // Simulate clicking translate.
   process()->sink().ClearMessages();
   bubble->Translate();
   SimulateTranslateScriptURLFetch(false);
 
   // We should not have sent any message to translate to the renderer.
   EXPECT_FALSE(GetTranslateMessage(NULL, NULL, NULL));
 
   // And we should have an error infobar showing.
   bubble = factory->model();
   ASSERT_TRUE(bubble != NULL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ERROR, bubble->GetViewState());
 }
 
 TEST_F(TranslateManagerRenderViewHostTest, BubbleUnknownLanguage) {
-  // Prepare for the bubble
-  TranslateService::SetUseInfobar(false);
+  // This test only applies to the bubble transle UX, not the old infobar UX.
+  if (!TranslateService::IsTranslateBubbleEnabled())
+    return;
+
   MockTranslateBubbleFactory* factory = new MockTranslateBubbleFactory;
   scoped_ptr<TranslateBubbleFactory> factory_ptr(factory);
   TranslateBubbleFactory::SetFactory(factory);
 
   // Simulate navigating to a page ("und" is the string returned by the CLD for
   // languages it does not recognize).
   SimulateNavigation(GURL("http://www.google.mys"), "und", true);
 
   // We should not have a bubble as we don't know the language.
   ASSERT_TRUE(factory->model() == NULL);
 
   // Translate the page anyway throught the context menu.
   scoped_ptr<TestRenderViewContextMenu> menu(CreateContextMenu());
   menu->Init();
   menu->ExecuteCommand(IDC_CONTENT_CONTEXT_TRANSLATE, 0);
 
   // Check the bubble exists instead of the infobar.
   TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar == NULL);
   TranslateBubbleModel* bubble = factory->model();
   ASSERT_TRUE(bubble != NULL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_TRANSLATING,
             bubble->GetViewState());
 }
-
-#endif  // defined(USE_AURA)