| Index: mojo/public/cpp/bindings/lib/control_message_proxy.cc
|
| diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
|
| index 6189e6973e792f691b9a94fb8cdc7ec329062273..63d131531352539bd6421f6b11d5cf78d6fa817c 100644
|
| --- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc
|
| +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
|
| @@ -25,14 +25,14 @@ class RunResponseForwardToCallback : public MessageReceiver {
|
| public:
|
| RunResponseForwardToCallback(const RunCallback& callback)
|
| : callback_(callback) {}
|
| - bool Accept(Message* message) override;
|
| + Result Accept(Message* message) override;
|
|
|
| private:
|
| RunCallback callback_;
|
| DISALLOW_COPY_AND_ASSIGN(RunResponseForwardToCallback);
|
| };
|
|
|
| -bool RunResponseForwardToCallback::Accept(Message* message) {
|
| +MessageReceiver::Result RunResponseForwardToCallback::Accept(Message* message) {
|
| RunResponseMessageParams_Data* params =
|
| reinterpret_cast<RunResponseMessageParams_Data*>(
|
| message->mutable_payload());
|
| @@ -43,7 +43,7 @@ bool RunResponseForwardToCallback::Accept(Message* message) {
|
| Deserialize<RunResponseMessageParamsPtr>(params, ¶ms_ptr, &context);
|
|
|
| callback_.Run(std::move(params_ptr->query_version_result));
|
| - return true;
|
| + return Result::ForSuccess();
|
| }
|
|
|
| void SendRunMessage(MessageReceiverWithResponder* receiver,
|
| @@ -63,7 +63,7 @@ void SendRunMessage(MessageReceiverWithResponder* receiver,
|
| context);
|
| params->EncodePointers();
|
| MessageReceiver* responder = new RunResponseForwardToCallback(callback);
|
| - if (!receiver->AcceptWithResponder(builder.message(), responder))
|
| + if (!receiver->AcceptWithResponder(builder.message(), responder).Succeeded())
|
| delete responder;
|
| }
|
|
|
| @@ -83,8 +83,7 @@ void SendRunOrClosePipeMessage(MessageReceiverWithResponder* receiver,
|
| Serialize<RunOrClosePipeMessageParamsPtr>(params_ptr, builder.buffer(),
|
| ¶ms, context);
|
| params->EncodePointers();
|
| - bool ok = receiver->Accept(builder.message());
|
| - ALLOW_UNUSED_LOCAL(ok);
|
| + ignore_result(receiver->Accept(builder.message()));
|
| }
|
|
|
| } // namespace
|
|
|