Mojo: Report bindings validation errors via MojoNotifyBadMessage

mojo/public/cpp/bindings/lib/router.h

 // Copyright 2014 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 MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <queue>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/public/cpp/bindings/callback.h"
+#include "mojo/public/cpp/bindings/error.h"
 #include "mojo/public/cpp/bindings/lib/connector.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.h"
 
 namespace mojo {
 namespace internal {
 
 // TODO(yzshen): Consider removing this class and use MultiplexRouter in all
 // cases. crbug.com/594244
 class Router : public MessageReceiverWithResponder {
  public:
   Router(ScopedMessagePipeHandle message_pipe,
          FilterChain filters,
          bool expects_sync_requests,
          scoped_refptr<base::SingleThreadTaskRunner> runner);
   ~Router() override;
 
   // Sets the receiver to handle messages read from the message pipe that do
   // not have the kMessageIsResponse flag set.
   void set_incoming_receiver(MessageReceiverWithResponderStatus* receiver) {
     incoming_receiver_ = receiver;
   }
 
+  // Sets the interface name for this Router. Used only for debugging.
+  void set_interface_name(const std::string& name) {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    interface_name_ = name;
+  }
+
   // Sets the error handler to receive notifications when an error is
   // encountered while reading from the pipe or waiting to read from the pipe.
   void set_connection_error_handler(const Closure& error_handler) {
     error_handler_ = error_handler;
   }
 
   // Returns true if an error was encountered while reading from the pipe or
   // waiting to read from the pipe.
   bool encountered_error() const {
     DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 12 matching lines @@
   void CloseMessagePipe() {
     DCHECK(thread_checker_.CalledOnValidThread());
     connector_.CloseMessagePipe();
   }
 
   ScopedMessagePipeHandle PassMessagePipe() {
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.PassMessagePipe();
   }
 
-  void RaiseError() {
+  void RaiseError(Error error) {
     DCHECK(thread_checker_.CalledOnValidThread());
-    connector_.RaiseError();
+    connector_.RaiseError(std::move(error));
   }
 
   // MessageReceiver implementation:
-  bool Accept(Message* message) override;
+  bool Accept(Message* message, Error* error) override;
   bool AcceptWithResponder(Message* message,
-                           MessageReceiver* responder) override;
+                           MessageReceiver* responder,
+                           Error* error) override;
 
   // Blocks the current thread until the first incoming method call, i.e.,
   // either a call to a client method or a callback method, or |deadline|.
   bool WaitForIncomingMessage(MojoDeadline deadline) {
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.WaitForIncomingMessage(deadline);
   }
 
   // See Binding for details of pause/resume.
   void PauseIncomingMethodCallProcessing() {
@@ skipping 41 matching lines @@
   };
 
   using SyncResponseMap = std::map<uint64_t, std::unique_ptr<SyncResponseInfo>>;
 
   class HandleIncomingMessageThunk : public MessageReceiver {
    public:
     HandleIncomingMessageThunk(Router* router);
     ~HandleIncomingMessageThunk() override;
 
     // MessageReceiver implementation:
-    bool Accept(Message* message) override;
+    bool Accept(Message* message, Error* error) override;
 
    private:
     Router* router_;
   };
 
-  bool HandleIncomingMessage(Message* message);
+  bool HandleIncomingMessage(Message* message, Error* error);
   void HandleQueuedMessages();
-  bool HandleMessageInternal(Message* message);
+  bool HandleMessageInternal(Message* message, Error* error);
 
   void OnConnectionError();
 
   HandleIncomingMessageThunk thunk_;
   FilterChain filters_;
   Connector connector_;
   MessageReceiverWithResponderStatus* incoming_receiver_;
   AsyncResponderMap async_responders_;
   SyncResponseMap sync_responses_;
   uint64_t next_request_id_;
   bool testing_mode_;
+  std::string interface_name_;
   std::queue<std::unique_ptr<Message>> pending_messages_;
   // Whether a task has been posted to trigger processing of
   // |pending_messages_|.
   bool pending_task_for_messages_;
   bool encountered_error_;
   Closure error_handler_;
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<Router> weak_factory_;
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_