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

Unified Diff: ui/base/win/open_file_name_win_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
« no previous file with comments | « ui/base/win/open_file_name_win.cc ('k') | ui/shell_dialogs/select_file_dialog_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/win/open_file_name_win_unittest.cc
diff --git a/ui/base/win/open_file_name_win_unittest.cc b/ui/base/win/open_file_name_win_unittest.cc
index 9eaee791a75f6487338deebc94c15633945b69f1..d359d9d962a90e8ba33d215d40f4a617996d9ddd 100644
--- a/ui/base/win/open_file_name_win_unittest.cc
+++ b/ui/base/win/open_file_name_win_unittest.cc
@@ -27,8 +27,8 @@ void SetResult(const base::string16& result, ui::win::OpenFileName* ofn) {
}
void CheckFilters(
- const std::vector<Tuple2<base::string16, base::string16> >& expected,
- const std::vector<Tuple2<base::string16, base::string16> >& actual) {
+ const std::vector<Tuple<base::string16, base::string16>>& expected,
+ const std::vector<Tuple<base::string16, base::string16>>& actual) {
if (expected.size() != actual.size()) {
ADD_FAILURE() << "filter count mismatch. Got " << actual.size()
<< " expected " << expected.size() << ".";
@@ -36,8 +36,10 @@ void CheckFilters(
}
for (size_t i = 0; i < expected.size(); ++i) {
- EXPECT_EQ(expected[i].a, actual[i].a) << "Mismatch at index " << i;
- EXPECT_EQ(expected[i].b, actual[i].b) << "Mismatch at index " << i;
+ EXPECT_EQ(get<0>(expected[i]), get<0>(actual[i]))
+ << "Mismatch at index " << i;
+ EXPECT_EQ(get<1>(expected[i]), get<1>(actual[i]))
+ << "Mismatch at index " << i;
}
}
@@ -201,7 +203,7 @@ TEST(OpenFileNameTest, SetAndGetFilters) {
const base::string16 kNull(L"\0", 1);
ui::win::OpenFileName ofn(kHwnd, kFlags);
- std::vector<Tuple2<base::string16, base::string16> > filters;
+ std::vector<Tuple<base::string16, base::string16>> filters;
ofn.SetFilters(filters);
EXPECT_FALSE(ofn.GetOPENFILENAME()->lpstrFilter);
CheckFilters(filters,
« no previous file with comments | « ui/base/win/open_file_name_win.cc ('k') | ui/shell_dialogs/select_file_dialog_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698