Index: ppapi/proxy/nacl_message_scanner.cc |
diff --git a/ppapi/proxy/nacl_message_scanner.cc b/ppapi/proxy/nacl_message_scanner.cc |
index 643f6f7beabf4077a3fe86e2d0b8187b23c5c93d..d07fceaf7a25f241e479e1c6c8df79dd715ef9d0 100644 |
--- a/ppapi/proxy/nacl_message_scanner.cc |
+++ b/ppapi/proxy/nacl_message_scanner.cc |
@@ -194,8 +194,7 @@ class MessageScannerImpl { |
: msg_(static_cast<const MessageType*>(msg)) { |
} |
bool ScanMessage(ScanningResults* results) { |
- typename base::TupleTypes<typename MessageType::Schema::Param>::ValueTuple |
- params; |
+ typename MessageType::Param params; |
if (!MessageType::Read(msg_, ¶ms)) |
return false; |
ScanTuple(params, results); |
@@ -203,8 +202,7 @@ class MessageScannerImpl { |
} |
bool ScanSyncMessage(ScanningResults* results) { |
- typename base::TupleTypes<typename MessageType::Schema::SendParam> |
- ::ValueTuple params; |
+ typename MessageType::SendParam params; |
if (!MessageType::ReadSendParam(msg_, ¶ms)) |
return false; |
// If we need to rewrite the message, write the message id first. |
@@ -218,8 +216,7 @@ class MessageScannerImpl { |
} |
bool ScanReply(ScanningResults* results) { |
- typename base::TupleTypes<typename MessageType::Schema::ReplyParam> |
- ::ValueTuple params; |
+ typename MessageType::ReplyParam params; |
if (!MessageType::ReadReplyParam(msg_, ¶ms)) |
return false; |
// If we need to rewrite the message, write the message id first. |