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

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

Issue 145023015: Introduce TranslateService and TranslateDownloadManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unittest Created 6 years, 11 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
« no previous file with comments | « chrome/browser/translate/translate_language_list.cc ('k') | chrome/browser/translate/translate_script.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 13aaf013fcf65ccef5e8f3ba4a6f64b9b0ee30c4..6181c22cf1aba069573af12a9b0f23edf324be3f 100644
--- a/chrome/browser/translate/translate_manager_browsertest.cc
+++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -23,6 +23,7 @@
#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"
@@ -38,6 +39,7 @@
#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_download_manager.h"
#include "components/translate/core/common/language_detection_details.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
@@ -233,6 +235,7 @@ class TranslateManagerBrowserTest : public ChromeRenderViewHostTestHarness,
// 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).
+ TranslateService::Initialize();
TranslateManager::GetInstance()->ClearTranslateScript();
TranslateManager::GetInstance()->
SetTranslateScriptExpirationDelay(60 * 60 * 1000);
@@ -258,6 +261,12 @@ class TranslateManagerBrowserTest : public ChromeRenderViewHostTestHarness,
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);
@@ -982,7 +991,7 @@ TEST_F(TranslateManagerBrowserTest, ServerReportsUnsupportedLanguage) {
// 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 =
@@ -1004,14 +1013,14 @@ TEST_F(TranslateManagerBrowserTest, UnsupportedUILanguage) {
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 =
« no previous file with comments | « chrome/browser/translate/translate_language_list.cc ('k') | chrome/browser/translate/translate_script.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698