Mojo: Report bindings validation errors via MojoNotifyBadMessage

mojo/public/cpp/bindings/lib/multiplex_router.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_MULTIPLEX_ROUTER_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 77 matching lines @@
       const ScopedInterfaceEndpointHandle& handle,
       InterfaceEndpointClient* endpoint_client,
       scoped_refptr<base::SingleThreadTaskRunner> runner);
 
   // Detaches the client attached to the specified endpoint. It must be called
   // on the same thread as the corresponding AttachEndpointClient() call.
   void DetachEndpointClient(const ScopedInterfaceEndpointHandle& handle);
 
   // 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);
 
   std::unique_ptr<AssociatedGroup> CreateAssociatedGroup();
 
   static MultiplexRouter* GetRouter(AssociatedGroup* associated_group);
 
   // ---------------------------------------------------------------------------
   // The following public methods are called on the creating thread.
 
   // Please note that this method shouldn't be called unless it results from an
   // explicit request of the user of bindings (e.g., the user sets an
@@ skipping 19 matching lines @@
     connector_.PauseIncomingMethodCallProcessing();
   }
   void ResumeIncomingMethodCallProcessing() {
     DCHECK(thread_checker_.CalledOnValidThread());
     connector_.ResumeIncomingMethodCallProcessing();
   }
 
   // Whether there are any associated interfaces running currently.
   bool HasAssociatedEndpoints() const;
 
+  // Sets the master interface name. Used only for debugging information.
+  void SetMasterInterfaceName(const std::string& name);
+
   // Sets this object to testing mode.
   // In testing mode, the object doesn't disconnect the underlying message pipe
   // when it receives unexpected or invalid messages.
   void EnableTestingMode();
 
   // Is the router bound to a message pipe handle?
   bool is_valid() const {
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.is_valid();
   }
 
   // TODO(yzshen): consider removing this getter.
   MessagePipeHandle handle() const {
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.handle();
   }
 
  private:
   friend class base::RefCountedDeleteOnMessageLoop<MultiplexRouter>;
   friend class base::DeleteHelper<MultiplexRouter>;
 
   class InterfaceEndpoint;
   struct Task;
 
   ~MultiplexRouter() override;
 
   // MessageReceiver implementation:
-  bool Accept(Message* message) override;
+  Result Accept(Message* message) override;
 
   // PipeControlMessageHandlerDelegate implementation:
   bool OnPeerAssociatedEndpointClosed(InterfaceId id) override;
   bool OnAssociatedEndpointClosedBeforeSent(InterfaceId id) override;
 
   void OnPipeConnectionError();
 
   // Specifies whether we are allowed to directly call into
   // InterfaceEndpointClient (given that we are already on the same thread as
   // the client).
@@ skipping 40 matching lines @@
   void MaybePostToProcessTasks(base::SingleThreadTaskRunner* task_runner);
   void LockAndCallProcessTasks();
 
   // Updates the state of |endpoint|. If both the endpoint and its peer have
   // been closed, removes it from |endpoints_|.
   // NOTE: The method may invalidate |endpoint|.
   enum EndpointStateUpdateType { ENDPOINT_CLOSED, PEER_ENDPOINT_CLOSED };
   void UpdateEndpointStateMayRemove(InterfaceEndpoint* endpoint,
                                     EndpointStateUpdateType type);
 
-  void RaiseErrorInNonTestingMode();
+  void RaiseErrorInNonTestingMode(Result error);
 
   InterfaceEndpoint* FindOrInsertEndpoint(InterfaceId id, bool* inserted);
 
   // Whether to set the namespace bit when generating interface IDs. Please see
   // comments of kInterfaceIdNamespaceMask.
   const bool set_interface_id_namespace_bit_;
 
   MessageHeaderValidator header_validator_;
   Connector connector_;
 
@@ skipping 18 matching lines @@
 
   bool testing_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiplexRouter);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_MULTIPLEX_ROUTER_H_