Move Tuple to base namespace.

ui/base/win/open_file_name_win_unittest.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/base/win/open_file_name_win.h"
 
 #include "base/files/file_path.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const HWND kHwnd = reinterpret_cast<HWND>(0xDEADBEEF);
 const DWORD kFlags = OFN_OVERWRITEPROMPT | OFN_EXPLORER | OFN_ENABLESIZING;
 
 void SetResult(const base::string16& result, ui::win::OpenFileName* ofn) {
   if (ofn->GetOPENFILENAME()->nMaxFile <= result.size()) {
     ADD_FAILURE() << "filename buffer insufficient.";
     return;
   }
   if (!result.size()) {
     ofn->GetOPENFILENAME()->lpstrFile[0] = 0;
   } else {
     // Because the result has embedded nulls, we must memcpy.
     memcpy(ofn->GetOPENFILENAME()->lpstrFile,
            result.c_str(),
            (result.size() + 1) * sizeof(result[0]));
   }
 }
 
 void CheckFilters(
-    const std::vector<Tuple<base::string16, base::string16>>& expected,
-    const std::vector<Tuple<base::string16, base::string16>>& actual) {
+    const std::vector<base::Tuple<base::string16, base::string16>>& expected,
+    const std::vector<base::Tuple<base::string16, base::string16>>& actual) {
   if (expected.size() != actual.size()) {
     ADD_FAILURE() << "filter count mismatch. Got " << actual.size()
                   << " expected " << expected.size() << ".";
     return;
   }
 
   for (size_t i = 0; i < expected.size(); ++i) {
-    EXPECT_EQ(get<0>(expected[i]), get<0>(actual[i]))
+    EXPECT_EQ(base::get<0>(expected[i]), base::get<0>(actual[i]))
         << "Mismatch at index " << i;
-    EXPECT_EQ(get<1>(expected[i]), get<1>(actual[i]))
+    EXPECT_EQ(base::get<1>(expected[i]), base::get<1>(actual[i]))
         << "Mismatch at index " << i;
   }
 }
 
 void CheckFilterString(const base::string16& expected,
                        const ui::win::OpenFileName& ofn) {
   if (!ofn.GetOPENFILENAME()->lpstrFilter) {
     ADD_FAILURE() << "Filter string is NULL.";
     return;
   }
@@ skipping 144 matching lines @@
   SetResult(L"", &ofn);
   ofn.GetResult(&directory, &filenames);
   EXPECT_EQ(base::FilePath(), directory);
   ASSERT_EQ(0u, filenames.size());
 }
 
 TEST(OpenFileNameTest, SetAndGetFilters) {
   const base::string16 kNull(L"\0", 1);
 
   ui::win::OpenFileName ofn(kHwnd, kFlags);
-  std::vector<Tuple<base::string16, base::string16>> filters;
+  std::vector<base::Tuple<base::string16, base::string16>> filters;
   ofn.SetFilters(filters);
   EXPECT_FALSE(ofn.GetOPENFILENAME()->lpstrFilter);
   CheckFilters(filters,
                ui::win::OpenFileName::GetFilters(ofn.GetOPENFILENAME()));
 
-  filters.push_back(MakeTuple(base::string16(L"a"), base::string16(L"b")));
+  filters.push_back(base::MakeTuple(base::string16(L"a"), base::string16(L"b")));
   ofn.SetFilters(filters);
   CheckFilterString(L"a" + kNull + L"b" + kNull, ofn);
   CheckFilters(filters,
                ui::win::OpenFileName::GetFilters(ofn.GetOPENFILENAME()));
 
-  filters.push_back(MakeTuple(base::string16(L"X"), base::string16(L"Y")));
+  filters.push_back(base::MakeTuple(base::string16(L"X"), base::string16(L"Y")));
   ofn.SetFilters(filters);
   CheckFilterString(L"a" + kNull + L"b" + kNull + L"X" + kNull + L"Y" + kNull,
                     ofn);
   CheckFilters(filters,
                ui::win::OpenFileName::GetFilters(ofn.GetOPENFILENAME()));
 }
 
 TEST(OpenFileNameTest, SetResult) {
   const base::string16 kNull(L"\0", 1);
 
@@ skipping 13 matching lines @@
   ui::win::OpenFileName::SetResult(directory, filenames, ofn.GetOPENFILENAME());
   CheckResult(L"C:\\dir" + kNull + L"file" + kNull + L"otherfile" + kNull, ofn);
 
   base::char16 short_buffer[10] = L"";
 
   ofn.GetOPENFILENAME()->lpstrFile = short_buffer;
   ofn.GetOPENFILENAME()->nMaxFile = arraysize(short_buffer);
   ui::win::OpenFileName::SetResult(directory, filenames, ofn.GetOPENFILENAME());
   CheckResult(L"", ofn);
 }