Mojo C++ bindings: support sync methods - part 1.

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 "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/lib/connector.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.h"
-#include "mojo/public/cpp/bindings/lib/shared_data.h"
 #include "mojo/public/cpp/environment/environment.h"
 
 namespace mojo {
 namespace internal {
 
 class Router : public MessageReceiverWithResponder {
  public:
   Router(ScopedMessagePipeHandle message_pipe,
          FilterChain filters,
          const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter());
@@ skipping 69 matching lines @@
   // - the object is more tolerant of unrecognized response messages;
   // - the connector continues working after seeing errors from its incoming
   //   receiver.
   void EnableTestingMode();
 
   MessagePipeHandle handle() const { return connector_.handle(); }
 
   // Returns true if this Router has any pending callbacks.
   bool has_pending_responders() const {
     DCHECK(thread_checker_.CalledOnValidThread());
-    return !responders_.empty();
+    return !async_responders_.empty() || !sync_responders_.empty();
   }
 
  private:
+  // Maps from the id of a response to the MessageReceiver that handles the
+  // response.
   typedef std::map<uint64_t, MessageReceiver*> ResponderMap;
 
   class HandleIncomingMessageThunk : public MessageReceiver {
    public:
     HandleIncomingMessageThunk(Router* router);
     ~HandleIncomingMessageThunk() override;
 
     // MessageReceiver implementation:
     bool Accept(Message* message) override;
 
    private:
     Router* router_;
   };
 
   bool HandleIncomingMessage(Message* message);
 
   HandleIncomingMessageThunk thunk_;
   FilterChain filters_;
   Connector connector_;
-  SharedData<Router*> weak_self_;
   MessageReceiverWithResponderStatus* incoming_receiver_;
-  // Maps from the id of a response to the MessageReceiver that handles the
-  // response.
-  ResponderMap responders_;
+  ResponderMap async_responders_;
+  ResponderMap sync_responders_;
   uint64_t next_request_id_;
   bool testing_mode_;
   base::ThreadChecker thread_checker_;
+  base::WeakPtrFactory<Router> weak_factory_;
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ROUTER_H_