diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 06:34:06 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 06:34:06 +0000 |
| commit | 7c3ed12e886040fbb1cec171d1d45cb2b7ddf003 (patch) | |
| tree | 22eb86a9fa487181fe82efc24ed186d3958427e2 /chrome/browser/translate | |
| parent | 963e4de825d0d116f345f89a0fa9ef32f98e6a2e (diff) | |
| download | chromium_src-7c3ed12e886040fbb1cec171d1d45cb2b7ddf003.zip chromium_src-7c3ed12e886040fbb1cec171d1d45cb2b7ddf003.tar.gz chromium_src-7c3ed12e886040fbb1cec171d1d45cb2b7ddf003.tar.bz2 | |
Making the translate context menu reset the blacklisting.
BUG=None
TEST=Select a site in a language different than the Chrome
language, select never translate this site/language.
Visit that site again, use the context menu to translate.
The site and language should not be blacklisted for translation
anymore.
Review URL: http://codereview.chromium.org/1551001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/translate')
| -rw-r--r-- | chrome/browser/translate/translate_manager_unittest.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc index 708b29d..bc0924c 100644 --- a/chrome/browser/translate/translate_manager_unittest.cc +++ b/chrome/browser/translate/translate_manager_unittest.cc @@ -749,9 +749,16 @@ TEST_F(TranslateManagerTest, AlwaysTranslateLanguagePref) { // Context menu. TEST_F(TranslateManagerTest, ContextMenu) { + // Blacklist www.google.fr and French for translation. + GURL url("http://www.google.fr"); + TranslatePrefs translate_prefs(contents()->profile()->GetPrefs()); + translate_prefs.BlacklistLanguage("fr"); + translate_prefs.BlacklistSite(url.host()); + EXPECT_TRUE(translate_prefs.IsLanguageBlacklisted("fr")); + EXPECT_TRUE(translate_prefs.IsSiteBlacklisted(url.host())); + // Simulate navigating to a page in French. The translate menu should show. - SimulateNavigation(GURL("http://www.google.fr"), 0, L"Le Google", "fr"); - EXPECT_TRUE(GetTranslateInfoBar() != NULL); + SimulateNavigation(url, 0, L"Le Google", "fr"); scoped_ptr<TestRenderViewContextMenu> menu( TestRenderViewContextMenu::CreateContextMenu(contents())); menu->Init(); @@ -770,6 +777,10 @@ TEST_F(TranslateManagerTest, ContextMenu) { EXPECT_EQ("en", target_lang); process()->sink().ClearMessages(); + // This should also have reverted the blacklisting of this site and language. + EXPECT_FALSE(translate_prefs.IsLanguageBlacklisted("fr")); + EXPECT_FALSE(translate_prefs.IsSiteBlacklisted(url.host())); + // Let's simulate the page being translated. rvh()->TestOnMessageReceived(ViewHostMsg_PageTranslated(0, 0, "fr", "en", TranslateErrors::NONE)); |