Update legacy Tuple-using code.

ppapi/proxy/ppapi_message_utils.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.
 
 #ifndef PPAPI_PROXY_PPAPI_MESSAGE_UTILS_H_
 #define PPAPI_PROXY_PPAPI_MESSAGE_UTILS_H_
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/tuple.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace ppapi {
 
 namespace internal {
 
 // TupleTypeMatch* check whether a tuple type contains elements of the specified
 // types. They are used to make sure the output parameters of UnpackMessage()
 // match the corresponding message type.
 template <class TupleType, class A>
 struct TupleTypeMatch1 {
   static const bool kValue = false;
 };
 template <class A>
-struct TupleTypeMatch1<Tuple1<A>, A> {
+struct TupleTypeMatch1<Tuple<A>, A> {
   static const bool kValue = true;
 };
 
 template <class TupleType, class A, class B>
 struct TupleTypeMatch2 {
   static const bool kValue = false;
 };
 template <class A, class B>
-struct TupleTypeMatch2<Tuple2<A, B>, A, B> {
+struct TupleTypeMatch2<Tuple<A, B>, A, B> {
   static const bool kValue = true;
 };
 
 template <class TupleType, class A, class B, class C>
 struct TupleTypeMatch3 {
   static const bool kValue = false;
 };
 template <class A, class B, class C>
-struct TupleTypeMatch3<Tuple3<A, B, C>, A, B, C> {
+struct TupleTypeMatch3<Tuple<A, B, C>, A, B, C> {
   static const bool kValue = true;
 };
 
 template <class TupleType, class A, class B, class C, class D>
 struct TupleTypeMatch4 {
   static const bool kValue = false;
 };
 template <class A, class B, class C, class D>
-struct TupleTypeMatch4<Tuple4<A, B, C, D>, A, B, C, D> {
+struct TupleTypeMatch4<Tuple<A, B, C, D>, A, B, C, D> {
   static const bool kValue = true;
 };
 
 template <class TupleType, class A, class B, class C, class D, class E>
 struct TupleTypeMatch5 {
   static const bool kValue = false;
 };
 template <class A, class B, class C, class D, class E>
-struct TupleTypeMatch5<Tuple5<A, B, C, D, E>, A, B, C, D, E> {
+struct TupleTypeMatch5<Tuple<A, B, C, D, E>, A, B, C, D, E> {
   static const bool kValue = true;
 };
 
 }  // namespace internal
 
 template <class MsgClass, class A>
 bool UnpackMessage(const IPC::Message& msg, A* a) {
   COMPILE_ASSERT(
       (internal::TupleTypeMatch1<typename MsgClass::Param, A>::kValue),
       tuple_types_dont_match);
@@ skipping 48 matching lines @@
   return IPC::ReadParam(&msg, &iter, a) &&
          IPC::ReadParam(&msg, &iter, b) &&
          IPC::ReadParam(&msg, &iter, c) &&
          IPC::ReadParam(&msg, &iter, d) &&
          IPC::ReadParam(&msg, &iter, e);
 }
 
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPAPI_MESSAGE_UTILS_H_
-