Use unions for interface control messages.

mojo/public/cpp/bindings/lib/validation_util.cc

Index: mojo/public/cpp/bindings/lib/validation_util.cc
diff --git a/mojo/public/cpp/bindings/lib/validation_util.cc b/mojo/public/cpp/bindings/lib/validation_util.cc
index 4a7e30563ed16af98cc69174bee9b2220e044b21..32d0aa58940eff3804da9b328cda3548537d2a6c 100644
--- a/mojo/public/cpp/bindings/lib/validation_util.cc
+++ b/mojo/public/cpp/bindings/lib/validation_util.cc
@@ -106,16 +106,18 @@ bool ValidateMessageIsResponse(const Message* message,
 bool ValidateControlRequest(const Message* message,
                             ValidationContext* validation_context) {
   switch (message->header()->name) {
-    case kRunMessageId:
+    case interface_control::kRunMessageId:
       return ValidateMessageIsRequestExpectingResponse(message,
                                                        validation_context) &&
-             ValidateMessagePayload<RunMessageParams_Data>(message,
-                                                           validation_context);
-    case kRunOrClosePipeMessageId:
+             ValidateMessagePayload<
+                 interface_control::internal::RunMessageParams_Data>(
+                 message, validation_context);
+    case interface_control::kRunOrClosePipeMessageId:
       return ValidateMessageIsRequestWithoutResponse(message,
                                                      validation_context) &&
-          ValidateMessagePayload<RunOrClosePipeMessageParams_Data>(
-              message, validation_context);
+             ValidateMessagePayload<
+                 interface_control::internal::RunOrClosePipeMessageParams_Data>(
+                 message, validation_context);
   }
   return false;
 }
@@ -125,8 +127,9 @@ bool ValidateControlResponse(const Message* message,
   if (!ValidateMessageIsResponse(message, validation_context))
     return false;
   switch (message->header()->name) {
-    case kRunMessageId:
-      return ValidateMessagePayload<RunResponseMessageParams_Data>(
+    case interface_control::kRunMessageId:
+      return ValidateMessagePayload<
+          interface_control::internal::RunResponseMessageParams_Data>(
           message, validation_context);
   }
   return false;