Update legacy Tuple-using code.

BUG=440675
TEST=no change
R=mdempsky@chromium.org, thakis@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/821453003

Cr-Commit-Position: refs/heads/master@{#309441}

3 files changed, 16 insertions, 17 deletions

diff --git a/ui/base/win/open_file_name_win.cc b/ui/base/win/open_file_name_win.cc
index 3914fa5..167609d 100644
--- a/ui/base/win/open_file_name_win.cc
+++ b/ui/base/win/open_file_name_win.cc
@@ -85,18 +85,15 @@ OpenFileName::~OpenFileName() {
 }
 
 void OpenFileName::SetFilters(
-    const std::vector<Tuple2<base::string16, base::string16> >& filters) {
+    const std::vector<Tuple<base::string16, base::string16>>& filters) {
   openfilename_.lpstrFilter = NULL;
   filter_buffer_.clear();
   if (filters.empty())
     return;
-  for (std::vector<Tuple2<base::string16, base::string16> >::const_iterator
-           it = filters.begin();
-       it != filters.end();
-       ++it) {
-    filter_buffer_.append(it->a);
+  for (const auto& filter : filters) {
+    filter_buffer_.append(get<0>(filter));
     filter_buffer_.push_back(0);
-    filter_buffer_.append(it->b);
+    filter_buffer_.append(get<1>(filter));
     filter_buffer_.push_back(0);
   }
   filter_buffer_.push_back(0);
@@ -205,9 +202,9 @@ void OpenFileName::SetResult(const base::FilePath& directory,
 }
 
 // static
-std::vector<Tuple2<base::string16, base::string16> > OpenFileName::GetFilters(
-    const OPENFILENAME* openfilename) {
-  std::vector<Tuple2<base::string16, base::string16> > filters;
+std::vector<Tuple<base::string16, base::string16>>
+OpenFileName::GetFilters(const OPENFILENAME* openfilename) {
+  std::vector<Tuple<base::string16, base::string16>> filters;
 
   const base::char16* display_string = openfilename->lpstrFilter;
   if (!display_string)
diff --git a/ui/base/win/open_file_name_win.h b/ui/base/win/open_file_name_win.h
index bdf01f4..1a3aab5 100644
--- a/ui/base/win/open_file_name_win.h
+++ b/ui/base/win/open_file_name_win.h
@@ -34,7 +34,7 @@ class UI_BASE_EXPORT OpenFileName {
 
   // Initializes |lpstrFilter| from the label/pattern pairs in |filters|.
   void SetFilters(
-      const std::vector<Tuple2<base::string16, base::string16> >& filters);
+      const std::vector<Tuple<base::string16, base::string16>>& filters);
 
   // Sets |lpstrInitialDir| and |lpstrFile|.
   void SetInitialSelection(const base::FilePath& initial_directory,
@@ -68,7 +68,7 @@ class UI_BASE_EXPORT OpenFileName {
 
   // Returns a vector of label/pattern pairs built from
   // |openfilename->lpstrFilter|.
-  static std::vector<Tuple2<base::string16, base::string16> > GetFilters(
+  static std::vector<Tuple<base::string16, base::string16>> GetFilters(
       const OPENFILENAME* openfilename);
 
  private:
diff --git a/ui/base/win/open_file_name_win_unittest.cc b/ui/base/win/open_file_name_win_unittest.cc
index 9eaee79..d359d9d 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,