Mojo: Report bindings validation errors via MojoNotifyBadMessage

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

 // Copyright 2015 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_INTERFACE_ENDPOINT_CLIENT_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_ENDPOINT_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 49 matching lines @@
   // Returns true if this endpoint has any pending callbacks.
   bool has_pending_responders() const {
     DCHECK(thread_checker_.CalledOnValidThread());
     return !async_responders_.empty() || !sync_responses_.empty();
   }
 
   MultiplexRouter* router() const { return handle_.router(); }
   AssociatedGroup* associated_group();
   uint32_t interface_id() const;
 
+  void set_interface_name(const std::string& name) {
+    DCHECK(thread_checker_.CalledOnValidThread());
+    interface_name_ = name;
+  }
+
   // After this call the object is in an invalid state and shouldn't be reused.
   ScopedInterfaceEndpointHandle PassHandle();
 
   // Raises an error on the underlying message pipe. It disconnects the pipe
   // and notifies all interfaces running on this pipe.
-  void RaiseError();
+  void RaiseError(Result error);
 
   // MessageReceiverWithResponder implementation:
-  bool Accept(Message* message) override;
-  bool AcceptWithResponder(Message* message,
-                           MessageReceiver* responder) override;
+  Result Accept(Message* message) override;
+  Result AcceptWithResponder(Message* message,
+                             MessageReceiver* responder) override;
 
   // The following methods are called by the router. They must be called
   // outside of the router's lock.
 
   // NOTE: |message| must have passed message header validation.
-  bool HandleIncomingMessage(Message* message);
+  Result HandleIncomingMessage(Message* message);
   void NotifyError();
 
  private:
   // Maps from the id of a response to the MessageReceiver that handles the
   // response.
   using AsyncResponderMap =
       std::map<uint64_t, std::unique_ptr<MessageReceiver>>;
 
   struct SyncResponseInfo {
    public:
@@ skipping 12 matching lines @@
   using SyncResponseMap = std::map<uint64_t, std::unique_ptr<SyncResponseInfo>>;
 
   // Used as the sink for |payload_validator_| and forwards messages to
   // HandleValidatedMessage().
   class HandleIncomingMessageThunk : public MessageReceiver {
    public:
     explicit HandleIncomingMessageThunk(InterfaceEndpointClient* owner);
     ~HandleIncomingMessageThunk() override;
 
     // MessageReceiver implementation:
-    bool Accept(Message* message) override;
+    Result Accept(Message* message) override;
 
    private:
     InterfaceEndpointClient* const owner_;
 
     DISALLOW_COPY_AND_ASSIGN(HandleIncomingMessageThunk);
   };
 
-  bool HandleValidatedMessage(Message* message);
+  Result HandleValidatedMessage(Message* message);
 
   ScopedInterfaceEndpointHandle handle_;
   std::unique_ptr<AssociatedGroup> associated_group_;
   InterfaceEndpointController* controller_;
 
   MessageReceiverWithResponderStatus* const incoming_receiver_;
   std::unique_ptr<MessageFilter> payload_validator_;
   HandleIncomingMessageThunk thunk_;
 
   AsyncResponderMap async_responders_;
   SyncResponseMap sync_responses_;
 
   uint64_t next_request_id_;
 
   Closure error_handler_;
   bool encountered_error_;
 
+  // The name of the interface which is bound by this client. Used only for
+  // debugging purposes.
+  std::string interface_name_;
+
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<InterfaceEndpointClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceEndpointClient);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_ENDPOINT_CLIENT_H_