| Index: components/translate/core/browser/translate_manager_unittest.cc
|
| diff --git a/components/translate/core/browser/translate_manager_unittest.cc b/components/translate/core/browser/translate_manager_unittest.cc
|
| index 0bd0dbe441cd579531e2a2c94d3ea9de1414a9b5..7a6f7313777f6166093429446e4c2ba9d62713d8 100644
|
| --- a/components/translate/core/browser/translate_manager_unittest.cc
|
| +++ b/components/translate/core/browser/translate_manager_unittest.cc
|
| @@ -4,7 +4,9 @@
|
|
|
| #include "components/translate/core/browser/translate_manager.h"
|
|
|
| +#include "base/prefs/testing_pref_service.h"
|
| #include "components/translate/core/browser/translate_download_manager.h"
|
| +#include "components/translate/core/browser/translate_prefs.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace translate {
|
| @@ -22,12 +24,14 @@ TEST(TranslateManagerTest, GetTargetLanguageDefaultsToAppLocale) {
|
| TranslateDownloadManager* manager = TranslateDownloadManager::GetInstance();
|
| manager->ResetForTesting();
|
| manager->set_application_locale("en");
|
| - EXPECT_EQ("en", TranslateManager::GetTargetLanguage(accept_language_list));
|
| + TestingPrefServiceSimple prefs;
|
| + TranslatePrefs translate_prefs(&prefs, "intl.accept_languages", NULL);
|
| + EXPECT_EQ("en", TranslateManager::GetTargetLanguage(&translate_prefs));
|
|
|
| // Try a second supported language.
|
| ASSERT_TRUE(TranslateDownloadManager::IsSupportedLanguage("de"));
|
| manager->set_application_locale("de");
|
| - EXPECT_EQ("de", TranslateManager::GetTargetLanguage(accept_language_list));
|
| + EXPECT_EQ("de", TranslateManager::GetTargetLanguage(&translate_prefs));
|
| }
|
|
|
| // If the application locale's language is not supported, the target language
|
| @@ -45,19 +49,23 @@ TEST(TranslateManagerTest, GetTargetLanguageAcceptLangFallback) {
|
| TranslateDownloadManager* manager = TranslateDownloadManager::GetInstance();
|
| manager->ResetForTesting();
|
| manager->set_application_locale("xy");
|
| + TestingPrefServiceSimple prefs;
|
| + TranslatePrefs translate_prefs(&prefs, "intl.accept_languages", NULL);
|
|
|
| // Default return is empty string.
|
| - EXPECT_EQ("", TranslateManager::GetTargetLanguage(accept_language_list));
|
| + EXPECT_EQ("", TranslateManager::GetTargetLanguage(&translate_prefs));
|
|
|
| // Unsupported languages still result in the empty string.
|
| ASSERT_FALSE(TranslateDownloadManager::IsSupportedLanguage("xy"));
|
| accept_language_list.push_back("xy");
|
| - EXPECT_EQ("", TranslateManager::GetTargetLanguage(accept_language_list));
|
| + translate_prefs.UpdateLanguageList(accept_language_list);
|
| + EXPECT_EQ("", TranslateManager::GetTargetLanguage(&translate_prefs));
|
|
|
| // First supported language is the fallback language.
|
| ASSERT_TRUE(TranslateDownloadManager::IsSupportedLanguage("en"));
|
| accept_language_list.push_back("en");
|
| - EXPECT_EQ("en", TranslateManager::GetTargetLanguage(accept_language_list));
|
| + translate_prefs.UpdateLanguageList(accept_language_list);
|
| + EXPECT_EQ("en", TranslateManager::GetTargetLanguage(&translate_prefs));
|
| }
|
|
|
| } // namespace translate
|
|
|