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

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

Issue 1159553007: Move Tuple to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/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 23ffae6731f8db065cba17858dcd885b89771442..07d73ab75c7f15d32abec97dfc40f129bcf103fe 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -529,13 +529,13 @@ TEST_F(TestUsePrerenderPage, SetEmbeddedSearchRequestParams) {
ASSERT_TRUE(message);
// Verify the IPC message params.
- Tuple<base::string16, EmbeddedSearchRequestParams> params;
+ base::Tuple<base::string16, EmbeddedSearchRequestParams> params;
ChromeViewMsg_SearchBoxSubmit::Read(message, &params);
- 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("foo", base::UTF16ToASCII(base::get<0>(params)));
+ EXPECT_EQ("f", base::UTF16ToASCII(base::get<1>(params).original_query));
+ EXPECT_EQ("utf-8", base::UTF16ToASCII(base::get<1>(params).input_encoding));
+ EXPECT_EQ("", base::UTF16ToASCII(base::get<1>(params).rlz_parameter_value));
EXPECT_EQ("chrome...0",
- base::UTF16ToASCII(get<1>(params).assisted_query_stats));
+ base::UTF16ToASCII(base::get<1>(params).assisted_query_stats));
}
#endif

Powered by Google App Engine
This is Rietveld 408576698