Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Unified Diff: chrome/browser/translate/translate_manager_browsertest.cc

Issue 15949022: Translate: language list smart updater (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits for retry Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/translate/translate_manager_browsertest.cc
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc
index 3adc5f7211ef8f2499d4628f97a9927bdf340602..3c2b65b85c2db1d1019a7e63df7a7bff12da0d4e 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -631,16 +631,13 @@ TEST_F(TranslateManagerBrowserTest, FetchLanguagesFromTranslateServer) {
server_languages.push_back("yy");
server_languages.push_back("fr-FR");
- // First, get the default languages list:
+ // 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);
// To make sure we got the defaults and don't confuse them with the mocks.
ASSERT_NE(default_supported_languages.size(), server_languages.size());
- Profile* profile =
- Profile::FromBrowserContext(web_contents()->GetBrowserContext());
- PrefService* prefs = profile->GetPrefs();
- TranslateManager::GetInstance()->FetchLanguageListFromTranslateServer(prefs);
// Check that we still get the defaults until the URLFetch has completed.
std::vector<std::string> current_supported_languages;
@@ -654,7 +651,6 @@ TEST_F(TranslateManagerBrowserTest, FetchLanguagesFromTranslateServer) {
EXPECT_EQ(default_supported_languages, current_supported_languages);
// Now check that we got the appropriate set of languages from the server.
- TranslateManager::GetInstance()->FetchLanguageListFromTranslateServer(prefs);
SimulateSupportedLanguagesURLFetch(true, server_languages);
current_supported_languages.clear();
TranslateManager::GetSupportedLanguages(&current_supported_languages);
@@ -666,10 +662,6 @@ TEST_F(TranslateManagerBrowserTest, FetchLanguagesFromTranslateServer) {
current_supported_languages.end(),
server_languages[i]));
}
-
- // Reset to original state.
- TranslateManager::GetInstance()->FetchLanguageListFromTranslateServer(prefs);
- SimulateSupportedLanguagesURLFetch(true, default_supported_languages);
}
std::string GetLanguageListString(

Powered by Google App Engine
This is Rietveld 408576698