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

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 14494004: Added the 'Translation Logs' tab to chrome://translate-internals/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (Rebasing) Created 7 years, 7 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/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index a47d2ba931f2a19d84e5d84b69e713703727e822..64ff7aa410ae4535b156cfd48b5bf376cfee3671 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -47,6 +47,7 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/language_detection_details.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
@@ -1039,7 +1040,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppIdSwitch) {
IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) {
ASSERT_TRUE(test_server()->Start());
- std::string lang;
+ //std::string lang;
+ LanguageDetectionDetails details;
// Open a new tab with a page in English.
AddTabAtIndex(0, GURL(test_server()->GetURL("files/english_page.html")),
@@ -1051,27 +1053,29 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) {
TranslateTabHelper::FromWebContents(current_web_contents);
content::Source<WebContents> source(current_web_contents);
- ui_test_utils::WindowedNotificationObserverWithDetails<std::string>
+ ui_test_utils::WindowedNotificationObserverWithDetails<
+ LanguageDetectionDetails>
en_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
source);
EXPECT_EQ("", translate_tab_helper->language_state().original_language());
en_language_detected_signal.Wait();
EXPECT_TRUE(en_language_detected_signal.GetDetailsFor(
- source.map_key(), &lang));
- EXPECT_EQ("en", lang);
+ source.map_key(), &details));
+ EXPECT_EQ("en", details.adopted_language);
EXPECT_EQ("en", translate_tab_helper->language_state().original_language());
// Now navigate to a page in French.
- ui_test_utils::WindowedNotificationObserverWithDetails<std::string>
+ ui_test_utils::WindowedNotificationObserverWithDetails<
+ LanguageDetectionDetails>
fr_language_detected_signal(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
source);
ui_test_utils::NavigateToURL(
browser(), GURL(test_server()->GetURL("files/french_page.html")));
fr_language_detected_signal.Wait();
- lang.clear();
+ details.adopted_language.clear();
EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor(
- source.map_key(), &lang));
- EXPECT_EQ("fr", lang);
+ source.map_key(), &details));
+ EXPECT_EQ("fr", details.adopted_language);
EXPECT_EQ("fr", translate_tab_helper->language_state().original_language());
}

Powered by Google App Engine
This is Rietveld 408576698