Revert "Update legacy Tuple-using code."

chrome/common/chrome_utility_messages.h

 // Copyright (c) 2012 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.
 
 // Multiply-included message file, so no include guard.
 
 #if defined(OS_WIN)
 #include <Windows.h>
 #endif  // defined(OS_WIN)
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/tuple.h"
 #include "base/values.h"
 #include "chrome/common/safe_browsing/zip_analyzer.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 #define IPC_MESSAGE_START ChromeUtilityMsgStart
 
 #ifndef CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 #define CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 
-typedef std::vector<Tuple<SkBitmap, base::FilePath>> DecodedImages;
+typedef std::vector<Tuple2<SkBitmap, base::FilePath> > DecodedImages;
 
 #endif  // CHROME_COMMON_CHROME_UTILITY_MESSAGES_H_
 
 IPC_STRUCT_TRAITS_BEGIN(safe_browsing::zip_analyzer::Results)
   IPC_STRUCT_TRAITS_MEMBER(success)
   IPC_STRUCT_TRAITS_MEMBER(has_executable)
   IPC_STRUCT_TRAITS_MEMBER(has_archive)
 IPC_STRUCT_TRAITS_END()
 
 #if defined(OS_WIN)
 
-// A vector of filters, each being a Tuple containing a display string (i.e.
+// A vector of filters, each being a Tuple2 containing a display string (i.e.
 // "Text Files") and a filter pattern (i.e. "*.txt").
-typedef std::vector<Tuple<base::string16, base::string16>>
+typedef std::vector<Tuple2<base::string16, base::string16> >
     GetOpenFileNameFilter;
 
 IPC_STRUCT_BEGIN(ChromeUtilityMsg_GetSaveFileName_Params)
   IPC_STRUCT_MEMBER(HWND, owner)
   IPC_STRUCT_MEMBER(DWORD, flags)
   IPC_STRUCT_MEMBER(GetOpenFileNameFilter, filters)
   IPC_STRUCT_MEMBER(int, one_based_filter_index)
   IPC_STRUCT_MEMBER(base::FilePath, suggested_filename)
   IPC_STRUCT_MEMBER(base::FilePath, initial_directory)
   IPC_STRUCT_MEMBER(base::string16, default_extension)
@@ skipping 126 matching lines @@
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetOpenFileName_Result,
                      base::FilePath /* directory */,
                      std::vector<base::FilePath> /* filenames */)
 IPC_MESSAGE_CONTROL0(ChromeUtilityHostMsg_GetSaveFileName_Failed)
 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetSaveFileName_Result,
                      base::FilePath /* path */,
                      int /* one_based_filter_index  */)
 IPC_MESSAGE_CONTROL1(ChromeUtilityHostMsg_BuildDirectWriteFontCache,
                      base::FilePath /* cache file path */)
 #endif  // defined(OS_WIN)