| Index: mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc
|
| diff --git a/mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc b/mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc
|
| index 1a8b087123d5e5201efc6213a023eea0a4a2dcd0..616d0d783b8668c55dc3e5b78160b8caae07cbfd 100644
|
| --- a/mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc
|
| +++ b/mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc
|
| @@ -2,18 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/public/cpp/bindings/lib/pipe_control_message_handler.h"
|
| +#include "mojo/public/cpp/bindings/pipe_control_message_handler.h"
|
|
|
| #include "base/logging.h"
|
| #include "mojo/public/cpp/bindings/lib/message_builder.h"
|
| -#include "mojo/public/cpp/bindings/lib/pipe_control_message_handler_delegate.h"
|
| #include "mojo/public/cpp/bindings/lib/serialization.h"
|
| #include "mojo/public/cpp/bindings/lib/validation_context.h"
|
| #include "mojo/public/cpp/bindings/lib/validation_util.h"
|
| +#include "mojo/public/cpp/bindings/pipe_control_message_handler_delegate.h"
|
| #include "mojo/public/interfaces/bindings/pipe_control_messages.mojom.h"
|
|
|
| namespace mojo {
|
| -namespace internal {
|
|
|
| PipeControlMessageHandler::PipeControlMessageHandler(
|
| PipeControlMessageHandlerDelegate* delegate)
|
| @@ -42,13 +41,15 @@ bool PipeControlMessageHandler::Accept(Message* message) {
|
| }
|
|
|
| bool PipeControlMessageHandler::Validate(Message* message) {
|
| - ValidationContext validation_context(
|
| + internal::ValidationContext validation_context(
|
| message->data(), message->data_num_bytes(), 0, message, description_);
|
|
|
| if (message->name() == pipe_control::kRunOrClosePipeMessageId) {
|
| - if (!ValidateMessageIsRequestWithoutResponse(message, &validation_context))
|
| + if (!internal::ValidateMessageIsRequestWithoutResponse(
|
| + message, &validation_context)) {
|
| return false;
|
| - return ValidateMessagePayload<
|
| + }
|
| + return internal::ValidateMessagePayload<
|
| pipe_control::internal::RunOrClosePipeMessageParams_Data>(
|
| message, &validation_context);
|
| }
|
| @@ -64,8 +65,8 @@ bool PipeControlMessageHandler::RunOrClosePipe(Message* message) {
|
| params->DecodePointers();
|
|
|
| pipe_control::RunOrClosePipeMessageParamsPtr params_ptr;
|
| - Deserialize<pipe_control::RunOrClosePipeMessageParamsPtr>(params, ¶ms_ptr,
|
| - &context_);
|
| + internal::Deserialize<pipe_control::RunOrClosePipeMessageParamsPtr>(
|
| + params, ¶ms_ptr, &context_);
|
|
|
| if (params_ptr->input->is_peer_associated_endpoint_closed_event()) {
|
| return delegate_->OnPeerAssociatedEndpointClosed(
|
| @@ -82,5 +83,4 @@ bool PipeControlMessageHandler::RunOrClosePipe(Message* message) {
|
| return false;
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace mojo
|
|
|