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

Unified Diff: chrome/browser/ui/search/instant_search_prerenderer_unittest.cc

Issue 821453003: Update legacy Tuple-using code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
index 7008a6a9d04ff79664b6c5eef45b8bc30d6d15db..f40a2941acd0bfc5780ed705e9208662c13d7c83 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -501,12 +501,13 @@ TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
ASSERT_TRUE(message);
// Verify the IPC message params.
- Tuple2<base::string16, EmbeddedSearchRequestParams> params;
+ Tuple<base::string16, EmbeddedSearchRequestParams> params;
ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
- EXPECT_EQ("foo", base::UTF16ToASCII(params.a));
- EXPECT_EQ("f", base::UTF16ToASCII(params.b.original_query));
- EXPECT_EQ("utf-8", base::UTF16ToASCII(params.b.input_encoding));
- EXPECT_EQ("", base::UTF16ToASCII(params.b.rlz_parameter_value));
- EXPECT_EQ("chrome...0", base::UTF16ToASCII(params.b.assisted_query_stats));
+ EXPECT_EQ("foo", base::UTF16ToASCII(get<0>(params)));
+ EXPECT_EQ("f", base::UTF16ToASCII(get<1>(params).original_query));
+ EXPECT_EQ("utf-8", base::UTF16ToASCII(get<1>(params).input_encoding));
+ EXPECT_EQ("", base::UTF16ToASCII(get<1>(params).rlz_parameter_value));
+ EXPECT_EQ("chrome...0",
+ base::UTF16ToASCII(get<1>(params).assisted_query_stats));
}
#endif

Powered by Google App Engine
This is Rietveld 408576698