#include "chrome/browser/prefs/session_startup_pref.h"
#include "chrome/browser/tab_contents/render_view_context_menu.h"
#include "chrome/browser/translate/translate_infobar_delegate.h"
-#include "chrome/browser/translate/translate_language_list.h"
#include "chrome/browser/translate/translate_manager.h"
-#include "chrome/browser/translate/translate_prefs.h"
-#include "chrome/browser/translate/translate_script.h"
+#include "chrome/browser/translate/translate_service.h"
#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/translate/core/browser/translate_accept_languages.h"
+#include "components/translate/core/browser/translate_download_manager.h"
+#include "components/translate/core/browser/translate_language_list.h"
+#include "components/translate/core/browser/translate_prefs.h"
+#include "components/translate/core/browser/translate_script.h"
#include "components/translate/core/common/language_detection_details.h"
+#include "components/translate/core/common/translate_pref_names.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_details.h"
}
void ExpireTranslateScriptImmediately() {
- TranslateManager::GetInstance()->SetTranslateScriptExpirationDelay(0);
+ TranslateDownloadManager::GetInstance()->SetTranslateScriptExpirationDelay(
+ 0);
}
// If there is 1 infobar and it is a translate infobar, deny translation and
// WebContents second). Also 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).
- TranslateManager::GetInstance()->ClearTranslateScript();
- TranslateManager::GetInstance()->
- SetTranslateScriptExpirationDelay(60 * 60 * 1000);
+ TranslateService::Initialize();
+ TranslateDownloadManager* download_manager =
+ TranslateDownloadManager::GetInstance();
+ download_manager->ClearTranslateScriptForTesting();
+ download_manager->SetTranslateScriptExpirationDelay(60 * 60 * 1000);
TranslateManager::GetInstance()->set_translate_max_reload_attemps(0);
+ TranslateService::SetUseInfobar(true);
ChromeRenderViewHostTestHarness::SetUp();
InfoBarService::CreateForWebContents(web_contents());
TestingBrowserProcess::DeleteInstance();
}
+ void SetApplicationLocale(const std::string& locale) {
+ g_browser_process->SetApplicationLocale(locale);
+ TranslateDownloadManager::GetInstance()->set_application_locale(
+ g_browser_process->GetApplicationLocale());
+ }
+
void SimulateTranslateScriptURLFetch(bool success) {
net::TestURLFetcher* fetcher =
url_fetcher_factory_.GetFetcherByID(TranslateScript::kFetcherId);
MockTranslateBubbleFactory() {
}
- virtual void ShowImplementation(
- BrowserWindow* window,
- content::WebContents* web_contents,
- TranslateBubbleModel::ViewState view_state,
- TranslateErrors::Type error_type) OVERRIDE {
+ virtual void ShowImplementation(BrowserWindow* window,
+ content::WebContents* web_contents,
+ TranslateTabHelper::TranslateStep step,
+ TranslateErrors::Type error_type) OVERRIDE {
if (model_) {
- model_->SetViewState(view_state);
+ model_->SetViewState(
+ TranslateBubbleModelImpl::TranslateStepToViewState(step));
return;
}
TranslateTabHelper::FromWebContents(web_contents);
std::string source_language =
translate_tab_helper->GetLanguageState().original_language();
- std::string target_language = TranslateManager::GetLanguageCode(
+ std::string target_language = TranslateDownloadManager::GetLanguageCode(
g_browser_process->GetApplicationLocale());
scoped_ptr<TranslateUIDelegate> ui_delegate(
new TranslateUIDelegate(web_contents,
source_language,
target_language));
- model_.reset(
- new TranslateBubbleModelImpl(view_state, ui_delegate.Pass()));
+ model_.reset(new TranslateBubbleModelImpl(step, ui_delegate.Pass()));
}
TranslateBubbleModel* model() { return model_.get(); }
params.writing_direction_right_to_left = 0;
#endif // OS_MACOSX
params.edit_flags = blink::WebContextMenuData::CanTranslate;
- return new TestRenderViewContextMenu(web_contents, params);
+ return new TestRenderViewContextMenu(web_contents->GetMainFrame(), params);
}
bool IsItemPresent(int id) {
ui::Accelerator* accelerator) OVERRIDE { return false; }
private:
- TestRenderViewContextMenu(content::WebContents* web_contents,
+ TestRenderViewContextMenu(content::RenderFrameHost* render_frame_host,
const content::ContextMenuParams& params)
- : RenderViewContextMenu(web_contents, params) {
+ : RenderViewContextMenu(render_frame_host, params) {
}
DISALLOW_COPY_AND_ASSIGN(TestRenderViewContextMenu);
// We should have an infobar.
TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, infobar->translate_step());
// Simulate clicking translate.
process()->sink().ClearMessages();
// The "Translating..." infobar should be showing.
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATING, infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATING, infobar->translate_step());
// Simulate the translate script being retrieved (it only needs to be done
// once in the test as it is cached).
// The after translate infobar should be showing.
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::AFTER_TRANSLATE, infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::AFTER_TRANSLATE, infobar->translate_step());
// Simulate changing the original language and translating.
process()->sink().ClearMessages();
ReloadAndWait(true);
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, infobar->translate_step());
infobar->UpdateTargetLanguageIndex(1);
infobar->ToggleAlwaysTranslate();
ReloadAndWait(true);
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATING, infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATING, infobar->translate_step());
EXPECT_EQ(new_target_lang, infobar->target_language_code());
}
// We should have an infobar.
TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, infobar->translate_step());
// Simulate clicking translate.
process()->sink().ClearMessages();
// And we should have an error infobar showing.
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATE_ERROR, infobar->translate_step());
}
// Ensures we deal correctly with pages for which the browser does not recognize
SimulateTranslateScriptURLFetch(false);
TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATE_ERROR, infobar->translate_step());
EXPECT_TRUE(infobar->is_error());
infobar->MessageInfoBarButtonPressed();
SimulateTranslateScriptURLFetch(true); // This time succeed.
// The after translate infobar should be showing.
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::AFTER_TRANSLATE, infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::AFTER_TRANSLATE, infobar->translate_step());
EXPECT_EQ("fr", infobar->original_language_code());
EXPECT_EQ("en", infobar->target_language_code());
SimulateOnPageTranslated(1, "en", "en", TranslateErrors::IDENTICAL_LANGUAGES);
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATE_ERROR, infobar->translate_step());
EXPECT_EQ(TranslateErrors::IDENTICAL_LANGUAGES, infobar->error_type());
// Let's run the same steps again but this time the server fails to detect the
TranslateErrors::UNKNOWN_LANGUAGE);
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATE_ERROR, infobar->translate_step());
EXPECT_EQ(TranslateErrors::UNKNOWN_LANGUAGE, infobar->error_type());
}
// Verify we have/don't have an info-bar as expected.
infobar = GetTranslateInfoBar();
- bool expected = TranslateManager::IsSupportedLanguage(lang) &&
- lang != "en";
+ bool expected =
+ TranslateDownloadManager::IsSupportedLanguage(lang) && lang != "en";
EXPECT_EQ(expected, infobar != NULL);
if (infobar != NULL)
// First, get the default languages list. Note that calling
// GetSupportedLanguages() invokes RequestLanguageList() internally.
std::vector<std::string> default_supported_languages;
- TranslateManager::GetSupportedLanguages(&default_supported_languages);
+ TranslateDownloadManager::GetSupportedLanguages(&default_supported_languages);
// To make sure we got the defaults and don't confuse them with the mocks.
ASSERT_NE(default_supported_languages.size(), server_languages.size());
// Check that we still get the defaults until the URLFetch has completed.
std::vector<std::string> current_supported_languages;
- TranslateManager::GetSupportedLanguages(¤t_supported_languages);
+ TranslateDownloadManager::GetSupportedLanguages(¤t_supported_languages);
EXPECT_EQ(default_supported_languages, current_supported_languages);
// Also check that it didn't change if we failed the URL fetch.
SimulateSupportedLanguagesURLFetch(false, std::vector<std::string>(),
true, std::vector<std::string>());
current_supported_languages.clear();
- TranslateManager::GetSupportedLanguages(¤t_supported_languages);
+ TranslateDownloadManager::GetSupportedLanguages(¤t_supported_languages);
EXPECT_EQ(default_supported_languages, current_supported_languages);
// Now check that we got the appropriate set of languages from the server.
SimulateSupportedLanguagesURLFetch(true, server_languages,
true, alpha_languages);
current_supported_languages.clear();
- TranslateManager::GetSupportedLanguages(¤t_supported_languages);
+ TranslateDownloadManager::GetSupportedLanguages(¤t_supported_languages);
// "xx" can't be displayed in the Translate inforbar, so this is eliminated.
EXPECT_EQ(server_languages.size() - 1, current_supported_languages.size());
// Not sure we need to guarantee the order of languages, so we find them.
bool is_alpha = std::find(alpha_languages.begin(),
alpha_languages.end(),
lang) != alpha_languages.end();
- EXPECT_EQ(TranslateManager::IsAlphaLanguage(lang), is_alpha);
+ EXPECT_EQ(TranslateDownloadManager::IsAlphaLanguage(lang), is_alpha);
}
}
// call GetSupportedLanguages to call RequestLanguageList internally.
std::vector<std::string> default_supported_languages;
- TranslateManager::GetSupportedLanguages(&default_supported_languages);
+ TranslateDownloadManager::GetSupportedLanguages(&default_supported_languages);
SimulateSupportedLanguagesURLFetch(true, server_languages,
false, alpha_languages);
std::vector<std::string> current_supported_languages;
- TranslateManager::GetSupportedLanguages(¤t_supported_languages);
+ TranslateDownloadManager::GetSupportedLanguages(¤t_supported_languages);
// "xx" can't be displayed in the Translate inforbar, so this is eliminated.
EXPECT_EQ(server_languages.size() - 1, current_supported_languages.size());
std::find(current_supported_languages.begin(),
current_supported_languages.end(),
lang));
- EXPECT_FALSE(TranslateManager::IsAlphaLanguage(lang));
+ EXPECT_FALSE(TranslateDownloadManager::IsAlphaLanguage(lang));
}
}
// language.
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATION_ERROR,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATE_ERROR, infobar->translate_step());
// This infobar should have a button (so the string should not be empty).
ASSERT_FALSE(infobar->GetMessageInfoBarButtonText().empty());
// Chrome is in a language that the translate server does not support.
TEST_F(TranslateManagerBrowserTest, UnsupportedUILanguage) {
std::string original_lang = g_browser_process->GetApplicationLocale();
- g_browser_process->SetApplicationLocale("qbz");
+ SetApplicationLocale("qbz");
// Make sure that the accept language list only contains unsupported languages
Profile* profile =
EXPECT_TRUE(menu->IsItemPresent(IDC_CONTENT_CONTEXT_TRANSLATE));
EXPECT_FALSE(menu->IsCommandIdEnabled(IDC_CONTENT_CONTEXT_TRANSLATE));
- g_browser_process->SetApplicationLocale(original_lang);
+ SetApplicationLocale(original_lang);
}
// Tests that the first supported accept language is selected
TEST_F(TranslateManagerBrowserTest, TranslateAcceptLanguage) {
// Set locate to non-existant language
std::string original_lang = g_browser_process->GetApplicationLocale();
- g_browser_process->SetApplicationLocale("qbz");
+ SetApplicationLocale("qbz");
// Set Qbz and French as the only accepted languages
Profile* profile =
registrar.Init(prefs);
registrar.Add(TranslatePrefs::kPrefTranslateBlockedLanguages,
pref_callback_);
- TranslatePrefs translate_prefs(prefs);
- EXPECT_FALSE(translate_prefs.IsBlockedLanguage("fr"));
- EXPECT_TRUE(translate_prefs.CanTranslateLanguage(profile, "fr"));
+ scoped_ptr<TranslatePrefs> translate_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(prefs));
+ EXPECT_FALSE(translate_prefs->IsBlockedLanguage("fr"));
+ TranslateAcceptLanguages* accept_languages =
+ TranslateTabHelper::GetTranslateAcceptLanguages(profile);
+ EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateBlockedLanguages);
- translate_prefs.BlockLanguage("fr");
- EXPECT_TRUE(translate_prefs.IsBlockedLanguage("fr"));
- EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(url.host()));
- EXPECT_FALSE(translate_prefs.CanTranslateLanguage(profile, "fr"));
+ translate_prefs->BlockLanguage("fr");
+ EXPECT_TRUE(translate_prefs->IsBlockedLanguage("fr"));
+ EXPECT_FALSE(translate_prefs->IsSiteBlacklisted(url.host()));
+ EXPECT_FALSE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
EXPECT_TRUE(CloseTranslateInfoBar());
// Remove the language from the blacklist.
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateBlockedLanguages);
- translate_prefs.UnblockLanguage("fr");
- EXPECT_FALSE(translate_prefs.IsBlockedLanguage("fr"));
- EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(url.host()));
- EXPECT_TRUE(translate_prefs.CanTranslateLanguage(profile, "fr"));
+ translate_prefs->UnblockLanguage("fr");
+ EXPECT_FALSE(translate_prefs->IsBlockedLanguage("fr"));
+ EXPECT_FALSE(translate_prefs->IsSiteBlacklisted(url.host()));
+ EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
// Navigate to a page in French.
SimulateNavigation(url, "fr", true);
PrefChangeRegistrar registrar;
registrar.Init(prefs);
registrar.Add(TranslatePrefs::kPrefTranslateSiteBlacklist, pref_callback_);
- TranslatePrefs translate_prefs(prefs);
- EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(host));
- EXPECT_TRUE(translate_prefs.CanTranslateLanguage(profile, "fr"));
+ scoped_ptr<TranslatePrefs> translate_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(prefs));
+ EXPECT_FALSE(translate_prefs->IsSiteBlacklisted(host));
+ TranslateAcceptLanguages* accept_languages =
+ TranslateTabHelper::GetTranslateAcceptLanguages(profile);
+ EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateSiteBlacklist);
- translate_prefs.BlacklistSite(host);
- EXPECT_TRUE(translate_prefs.IsSiteBlacklisted(host));
- EXPECT_TRUE(translate_prefs.CanTranslateLanguage(profile, "fr"));
+ translate_prefs->BlacklistSite(host);
+ EXPECT_TRUE(translate_prefs->IsSiteBlacklisted(host));
+ EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
EXPECT_TRUE(CloseTranslateInfoBar());
// Remove the site from the blacklist.
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateSiteBlacklist);
- translate_prefs.RemoveSiteFromBlacklist(host);
- EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(host));
- EXPECT_TRUE(translate_prefs.CanTranslateLanguage(profile, "fr"));
+ translate_prefs->RemoveSiteFromBlacklist(host);
+ EXPECT_FALSE(translate_prefs->IsSiteBlacklisted(host));
+ EXPECT_TRUE(translate_prefs->CanTranslateLanguage(accept_languages, "fr"));
// Navigate to a page in French.
SimulateNavigation(url, "fr", true);
PrefChangeRegistrar registrar;
registrar.Init(prefs);
registrar.Add(TranslatePrefs::kPrefTranslateWhitelists, pref_callback_);
- TranslatePrefs translate_prefs(prefs);
+ scoped_ptr<TranslatePrefs> translate_prefs(
+ TranslateTabHelper::CreateTranslatePrefs(prefs));
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateWhitelists);
- translate_prefs.WhitelistLanguagePair("fr", "en");
+ translate_prefs->WhitelistLanguagePair("fr", "en");
// Load a page in French.
SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
// The translating infobar should be showing.
TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATING, infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATING, infobar->translate_step());
SimulateTranslateScriptURLFetch(true);
int page_id = 0;
std::string original_lang, target_lang;
// Now revert the always translate pref and make sure we go back to expected
// behavior, which is show a "before translate" infobar.
SetPrefObserverExpectation(TranslatePrefs::kPrefTranslateWhitelists);
- translate_prefs.RemoveLanguagePairFromWhitelist("fr", "en");
+ translate_prefs->RemoveLanguagePairFromWhitelist("fr", "en");
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(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, infobar->translate_step());
}
// Context menu.
GURL url("http://www.google.fr");
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- TranslatePrefs translate_prefs(profile->GetPrefs());
- translate_prefs.BlockLanguage("fr");
- translate_prefs.BlacklistSite(url.host());
- EXPECT_TRUE(translate_prefs.IsBlockedLanguage("fr"));
- EXPECT_TRUE(translate_prefs.IsSiteBlacklisted(url.host()));
+ scoped_ptr<TranslatePrefs> translate_prefs(
+ TranslateTabHelper::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()));
// Simulate navigating to a page in French. The translate menu should show but
// should only be enabled when the page language has been received.
// The "translating..." infobar should be showing.
TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::TRANSLATING, infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::TRANSLATING, infobar->translate_step());
SimulateTranslateScriptURLFetch(true);
int page_id = 0;
std::string original_lang, target_lang;
process()->sink().ClearMessages();
// This should also have reverted the blacklisting of this site and language.
- EXPECT_FALSE(translate_prefs.IsBlockedLanguage("fr"));
- EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(url.host()));
+ EXPECT_FALSE(translate_prefs->IsBlockedLanguage("fr"));
+ EXPECT_FALSE(translate_prefs->IsSiteBlacklisted(url.host()));
// Let's simulate the page being translated.
SimulateOnPageTranslated("fr", "en");
TEST_F(TranslateManagerBrowserTest, BeforeTranslateExtraButtons) {
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- TranslatePrefs translate_prefs(profile->GetPrefs());
- translate_prefs.ResetTranslationAcceptedCount("fr");
- translate_prefs.ResetTranslationDeniedCount("fr");
- translate_prefs.ResetTranslationAcceptedCount("de");
- translate_prefs.ResetTranslationDeniedCount("de");
+ scoped_ptr<TranslatePrefs> translate_prefs(
+ TranslateTabHelper::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
// shown in that case, then 4 times in normal mode.
SimulateNavigation(GURL("http://www.google.fr"), "fr", true);
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, infobar->translate_step());
if (i < 7) {
EXPECT_FALSE(infobar->ShouldShowAlwaysTranslateShortcut());
infobar->Translate();
}
// Simulate the user pressing "Always translate French".
infobar->AlwaysTranslatePageLanguage();
- EXPECT_TRUE(translate_prefs.IsLanguagePairWhitelisted("fr", "en"));
+ EXPECT_TRUE(translate_prefs->IsLanguagePairWhitelisted("fr", "en"));
// Simulate the translate script being retrieved (it only needs to be done
// once in the test as it is cached).
SimulateTranslateScriptURLFetch(true);
SimulateNavigation(GURL("http://www.google.de"), "de", true);
infobar = GetTranslateInfoBar();
ASSERT_TRUE(infobar != NULL);
- EXPECT_EQ(TranslateInfoBarDelegate::BEFORE_TRANSLATE,
- infobar->infobar_type());
+ EXPECT_EQ(TranslateTabHelper::BEFORE_TRANSLATE, infobar->translate_step());
if (i < 7) {
EXPECT_FALSE(infobar->ShouldShowNeverTranslateShortcut());
infobar->TranslationDeclined();
}
// Simulate the user pressing "Never translate French".
infobar->NeverTranslatePageLanguage();
- EXPECT_TRUE(translate_prefs.IsBlockedLanguage("de"));
+ 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();
GURL(chrome::kChromeUIHistoryURL)));
}
-#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#if defined(USE_AURA)
TEST_F(TranslateManagerBrowserTest, BubbleNormalTranslate) {
// Prepare for the bubble
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- command_line->AppendSwitch(switches::kEnableTranslateNewUX);
+ TranslateService::SetUseInfobar(false);
MockTranslateBubbleFactory* factory = new MockTranslateBubbleFactory;
scoped_ptr<TranslateBubbleFactory> factory_ptr(factory);
TranslateBubbleFactory::SetFactory(factory);
TEST_F(TranslateManagerBrowserTest, BubbleTranslateScriptNotAvailable) {
// Prepare for the bubble
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- command_line->AppendSwitch(switches::kEnableTranslateNewUX);
+ TranslateService::SetUseInfobar(false);
MockTranslateBubbleFactory* factory = new MockTranslateBubbleFactory;
scoped_ptr<TranslateBubbleFactory> factory_ptr(factory);
TranslateBubbleFactory::SetFactory(factory);
TEST_F(TranslateManagerBrowserTest, BubbleUnknownLanguage) {
// Prepare for the bubble
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- command_line->AppendSwitch(switches::kEnableTranslateNewUX);
+ TranslateService::SetUseInfobar(false);
MockTranslateBubbleFactory* factory = new MockTranslateBubbleFactory;
scoped_ptr<TranslateBubbleFactory> factory_ptr(factory);
TranslateBubbleFactory::SetFactory(factory);
bubble->GetViewState());
}
-#endif // !defined(OS_ANDROID) && !defined(OS_IOS)
+#endif // defined(USE_AURA)
// Test is flaky on Win http://crbug.com/166334
#if defined(OS_WIN)
projects / platform / framework / web / crosswalk.git / blobdiff