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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1767343004: Replace base::Tuple in //chrome with std::tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« chrome/renderer/autofill/autofill_renderer_browsertest.cc ('K') | « chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc ('k') | chrome/utility/shell_handler_win.h » ('j') | chrome/utility/shell_handler_win.h » ('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 da914f7ba1c0e000bb0fb6f8ee0ae16ba5572c06..64f8def27dd9bc9675622526b923a00f7bfe0527 100644
--- a/chrome/renderer/translate/translate_helper_browsertest.cc
+++ b/chrome/renderer/translate/translate_helper_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <tuple>
+
#include "base/macros.h"
#include "base/time/time.h"
#include "chrome/common/chrome_isolated_world_ids.h"
@@ -79,15 +81,15 @@ class TranslateHelperBrowserTest : public ChromeRenderViewTest {
ChromeFrameHostMsg_PageTranslated::ID);
if (!message)
return false;
- base::Tuple<std::string, std::string, translate::TranslateErrors::Type>
+ std::tuple<std::string, std::string, translate::TranslateErrors::Type>
translate_param;
ChromeFrameHostMsg_PageTranslated::Read(message, &translate_param);
if (original_lang)
- *original_lang = base::get<0>(translate_param);
+ *original_lang = std::get<0>(translate_param);
if (target_lang)
- *target_lang = base::get<1>(translate_param);
+ *target_lang = std::get<1>(translate_param);
if (error)
- *error = base::get<2>(translate_param);
+ *error = std::get<2>(translate_param);
return true;
}
@@ -331,7 +333,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_TRUE(base::get<1>(params)) << "Page should be translatable.";
+ EXPECT_TRUE(std::get<1>(params)) << "Page should be translatable.";
render_thread_->sink().ClearMessages();
// Now the page specifies the META tag to prevent translation.
@@ -341,7 +343,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_FALSE(base::get<1>(params)) << "Page should not be translatable.";
+ EXPECT_FALSE(std::get<1>(params)) << "Page should not be translatable.";
render_thread_->sink().ClearMessages();
// Try the alternate version of the META tag (content instead of value).
@@ -351,7 +353,7 @@ TEST_F(ChromeRenderViewTest, TranslatablePage) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_FALSE(base::get<1>(params)) << "Page should not be translatable.";
+ EXPECT_FALSE(std::get<1>(params)) << "Page should not be translatable.";
}
// Tests that the language meta tag takes precedence over the CLD when reporting
@@ -368,7 +370,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("es", base::get<0>(params).adopted_language);
+ EXPECT_EQ("es", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
// Makes sure we support multiple languages specified.
@@ -379,7 +381,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTag) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("fr", base::get<0>(params).adopted_language);
+ EXPECT_EQ("fr", std::get<0>(params).adopted_language);
}
// Tests that the language meta tag works even with non-all-lower-case.
@@ -396,7 +398,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("es", base::get<0>(params).adopted_language);
+ EXPECT_EQ("es", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
// Makes sure we support multiple languages specified.
@@ -407,7 +409,7 @@ TEST_F(ChromeRenderViewTest, LanguageMetaTagCase) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("fr", base::get<0>(params).adopted_language);
+ EXPECT_EQ("fr", std::get<0>(params).adopted_language);
}
// Tests that the language meta tag is converted to Chrome standard of dashes
@@ -425,7 +427,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("en", base::get<0>(params).adopted_language);
+ EXPECT_EQ("en", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
LoadHTML("<html><head><meta http-equiv='Content-Language' content='ZH_tw'>"
@@ -434,7 +436,7 @@ TEST_F(ChromeRenderViewTest, LanguageCommonMistakesAreCorrected) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("zh-TW", base::get<0>(params).adopted_language);
+ EXPECT_EQ("zh-TW", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
}
@@ -448,7 +450,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Param params;
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("zh", base::get<0>(params).adopted_language);
+ EXPECT_EQ("zh", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
content::PageState back_state = GetCurrentPageState();
@@ -459,7 +461,7 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("fr", base::get<0>(params).adopted_language);
+ EXPECT_EQ("fr", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
GoBack(back_state);
@@ -468,6 +470,6 @@ TEST_F(ChromeRenderViewTest, BackToTranslatablePage) {
ChromeFrameHostMsg_TranslateLanguageDetermined::ID);
ASSERT_NE(static_cast<IPC::Message*>(NULL), message);
ChromeFrameHostMsg_TranslateLanguageDetermined::Read(message, &params);
- EXPECT_EQ("zh", base::get<0>(params).adopted_language);
+ EXPECT_EQ("zh", std::get<0>(params).adopted_language);
render_thread_->sink().ClearMessages();
}
« chrome/renderer/autofill/autofill_renderer_browsertest.cc ('K') | « chrome/renderer/spellchecker/spellcheck_provider_mac_unittest.cc ('k') | chrome/utility/shell_handler_win.h » ('j') | chrome/utility/shell_handler_win.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698