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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/translate/translate_helper_browsertest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: media Created 6 years 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
« base/observer_list_threadsafe.h ('K') | « chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc ('k') | chrome/utility/shell_handler_win.h » ('j') | components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/translate/translate_helper_browsertest.cc
diff --git a/chrome/renderer/translate/translate_helper_browsertest.cc b/chrome/renderer/translate/translate_helper_browsertest.cc
index 8ec52c348ae780cb7ae4716b6319945cce817e5e..3c0db278d2a13f2560314a1c841d4f7fcb1a0c8a 100644
--- a/chrome/renderer/translate/translate_helper_browsertest.cc
+++ b/chrome/renderer/translate/translate_helper_browsertest.cc
@@ -78,15 +78,15 @@ class TranslateHelperBrowserTest : public ChromeRenderViewTest {
GetUniqueMessageMatching(ChromeViewHostMsg_PageTranslated::ID);
if (!message)
return false;
- Tuple3<std::string, std::string, translate::TranslateErrors::Type>
+ Tuple<std::string, std::string, translate::TranslateErrors::Type>
translate_param;
ChromeViewHostMsg_PageTranslated::Read(message, &translate_param);
if (original_lang)
- *original_lang = translate_param.a;
+ *original_lang = get<0>(translate_param);
if (target_lang)
- *target_lang = translate_param.b;
+ *target_lang = get<1>(translate_param);
if (error)
- *error = translate_param.c;
+ *error = get<2>(translate_param);
return true;
}
@@ -330,7 +330,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_TRUE(params.b) << "Page should be translatable.";
+ EXPECT_TRUE(get<1>(params)) << "Page should be translatable.";
render_thread_->sink().ClearMessages();
// Now the page specifies the META tag to prevent translation.
@@ -340,7 +340,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_FALSE(params.b) << "Page should not be translatable.";
+ EXPECT_FALSE(get<1>(params)) << "Page should not be translatable.";
render_thread_->sink().ClearMessages();
// Try the alternate version of the META tag (content instead of value).
@@ -350,7 +350,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_FALSE(params.b) << "Page should not be translatable.";
+ EXPECT_FALSE(get<1>(params)) << "Page should not be translatable.";
}
// Tests that the language meta tag takes precedence over the CLD when reporting
@@ -367,7 +367,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("es", params.a.adopted_language);
+ EXPECT_EQ("es", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
// Makes sure we support multiple languages specified.
@@ -378,7 +378,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("fr", params.a.adopted_language);
+ EXPECT_EQ("fr", get<0>(params).adopted_language);
}
// Tests that the language meta tag works even with non-all-lower-case.
@@ -395,7 +395,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("es", params.a.adopted_language);
+ EXPECT_EQ("es", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
// Makes sure we support multiple languages specified.
@@ -406,7 +406,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("fr", params.a.adopted_language);
+ EXPECT_EQ("fr", get<0>(params).adopted_language);
}
// Tests that the language meta tag is converted to Chrome standard of dashes
@@ -424,7 +424,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("en", params.a.adopted_language);
+ EXPECT_EQ("en", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
LoadHTML("<html><head><meta http-equiv='Content-Language' content='ZH_tw'>"
@@ -433,7 +433,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("zh-TW", params.a.adopted_language);
+ EXPECT_EQ("zh-TW", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
}
@@ -447,7 +447,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Param params;
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("zh", params.a.adopted_language);
+ EXPECT_EQ("zh", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
content::PageState back_state = GetCurrentPageState();
@@ -458,7 +458,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("fr", params.a.adopted_language);
+ EXPECT_EQ("fr", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
GoBack(back_state);
@@ -467,6 +467,6 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
ChromeViewHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeViewHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("zh", params.a.adopted_language);
+ EXPECT_EQ("zh", get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
}
« base/observer_list_threadsafe.h ('K') | « chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc ('k') | chrome/utility/shell_handler_win.h » ('j') | components/password_manager/content/browser/content_credential_manager_dispatcher_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698