Mojo C++ bindings: error notification behavior related to sync calls.

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>
@@ skipping 19 matching lines @@
 
   // 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 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) {
-    connector_.set_connection_error_handler(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());
-    return connector_.encountered_error();
+    return encountered_error_;
   }
 
   // Is the router bound to a MessagePipe handle?
   bool is_valid() const {
     DCHECK(thread_checker_.CalledOnValidThread());
     return connector_.is_valid();
   }
 
   // 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 78 matching lines @@
 
     // MessageReceiver implementation:
     bool Accept(Message* message) override;
 
    private:
     Router* router_;
   };
 
   bool HandleIncomingMessage(Message* message);
   void HandleQueuedMessages();
+  bool HandleMessageInternal(Message* message);
 
-  bool HandleMessageInternal(Message* message);
+  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::queue<scoped_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_