Mojo: adding a thread safe associated interface ptr.

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

Index: mojo/public/cpp/bindings/lib/thread_safe_interface_ptr_base.h
diff --git a/mojo/public/cpp/bindings/thread_safe_interface_ptr.h b/mojo/public/cpp/bindings/lib/thread_safe_interface_ptr_base.h
similarity index 52%
copy from mojo/public/cpp/bindings/thread_safe_interface_ptr.h
copy to mojo/public/cpp/bindings/lib/thread_safe_interface_ptr_base.h
index 0366253c39062421ed73d54075d3bc39d0895c05..46b61b5af879f171e4a0bfb891fe08ff06da36df 100644
--- a/mojo/public/cpp/bindings/thread_safe_interface_ptr.h
+++ b/mojo/public/cpp/bindings/lib/thread_safe_interface_ptr_base.h
@@ -2,82 +2,53 @@
 // 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_THREAD_SAFE_INTERFACE_PTR_H_
-#define MOJO_PUBLIC_CPP_BINDINGS_THREAD_SAFE_INTERFACE_PTR_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_SAFE_INTERFACE_PTR_BASE_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_SAFE_INTERFACE_PTR_BASE_H_
 
 namespace mojo {
 
 #include <memory>
 
-#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "mojo/public/cpp/bindings/lib/interface_ptr_state.h"
 #include "mojo/public/cpp/bindings/message.h"
 
 struct ThreadSafeInterfacePtrDeleter;
 
-// ThreadSafeInterfacePtr is a version of InterfacePtr that lets caller invoke
-// interface methods from any threads. Callbacks are called on the thread that
-// performed the interface call.
-// To create a ThreadSafeInterfacePtr, create first a regular InterfacePtr that
-// you then provide to ThreadSafeInterfacePtr::Create.
-// You can then call methods on the ThreadSafeInterfacePtr from any thread.
-//
-// Ex:
-// frob::FrobinatorPtr frobinator;
-// frob::FrobinatorImpl impl(GetProxy(&frobinator));
-// scoped_refptr<frob::ThreadSafeFrobinatorPtr> thread_safe_frobinator =
-//     frob::ThreadSafeFrobinatorPtr::Create(std::move(frobinator));
-// (*thread_safe_frobinator)->FrobinateToTheMax();
-
+// Base class for thread safe interface pointers such as ThreadSafeInterfacePtr
+// and ThreadSafeAssociatedInterfacePtr.
 template <typename Interface>
-class ThreadSafeInterfacePtr : public MessageReceiverWithResponder,
-    public base::RefCountedThreadSafe<ThreadSafeInterfacePtr<Interface>,
+class ThreadSafeInterfacePtrBase : public MessageReceiverWithResponder,
+    public base::RefCountedThreadSafe<ThreadSafeInterfacePtrBase<Interface>,
                                       ThreadSafeInterfacePtrDeleter> {
  public:
   using ProxyType = typename Interface::Proxy_;
 
-  using AcceptCallback = base::Callback<void(Message)>;
-  using AcceptWithResponderCallback =
-      base::Callback<void(Message, std::unique_ptr<MessageReceiver>)>;
+  ~ThreadSafeInterfacePtrBase() override {}
 
   Interface* get() { return &proxy_; }
   Interface* operator->() { return get(); }
   Interface& operator*() { return *get(); }
 
-  static scoped_refptr<ThreadSafeInterfacePtr<Interface>> Create(
-      InterfacePtr<Interface> interface_ptr) {
-    if (!interface_ptr.is_bound()) {
-      LOG(ERROR) << "Attempting to create a ThreadSafeInterfacePtr from an "
-          "unbound InterfacePtr.";
-      return nullptr;
-    }
-    return new ThreadSafeInterfacePtr(std::move(interface_ptr),
-                                      base::ThreadTaskRunnerHandle::Get());
-  }
-
- private:
-  friend class base::RefCountedThreadSafe<ThreadSafeInterfacePtr<Interface>>;
-  friend struct ThreadSafeInterfacePtrDeleter;
-
-  ThreadSafeInterfacePtr(
-      InterfacePtr<Interface> interface_ptr,
+ protected:
+  explicit ThreadSafeInterfacePtrBase(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner)
       : interface_ptr_task_runner_(task_runner),
         proxy_(this),
-        interface_ptr_(std::move(interface_ptr)) {
-    // Note that it's important we do get the callback after interface_ptr_ has
-    // been set, as they would become invalid if interface_ptr_ is copied.
-    accept_callback_ = interface_ptr_.internal_state()->
-        GetThreadSafePtrAcceptCallback();
-    accept_with_responder_callback_ = interface_ptr_.internal_state()->
-        GetThreadSafePtrAcceptWithResponderCallback();
+        weak_ptr_factory_(this) {
   }
 
+  virtual void AcceptOnInterfacePtrThread(Message message) = 0;
+  virtual void AcceptWithResponderOnInterfacePtrThread(
+      Message message, std::unique_ptr<MessageReceiver> responder) = 0;
+
+ private:
+  friend class base::RefCountedThreadSafe<
+      ThreadSafeInterfacePtrBase<Interface>>;
+  friend struct ThreadSafeInterfacePtrDeleter;
+
   void DeleteOnCorrectThread() const {
     if (!interface_ptr_task_runner_->BelongsToCurrentThread() &&
         interface_ptr_task_runner_->DeleteSoon(FROM_HERE, this)) {
@@ -90,7 +61,9 @@ class ThreadSafeInterfacePtr : public MessageReceiverWithResponder,
   bool Accept(Message* message) override {
     interface_ptr_task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(accept_callback_, base::Passed(std::move(*message))));
+        base::Bind(&ThreadSafeInterfacePtrBase::AcceptOnInterfacePtrThread,
+                   weak_ptr_factory_.GetWeakPtr(),
+                   base::Passed(std::move(*message))));
     return true;
   }
 
@@ -100,7 +73,9 @@ class ThreadSafeInterfacePtr : public MessageReceiverWithResponder,
         base::WrapUnique(responder));
     interface_ptr_task_runner_->PostTask(
         FROM_HERE,
-        base::Bind(accept_with_responder_callback_,
+        base::Bind(&ThreadSafeInterfacePtrBase::
+                       AcceptWithResponderOnInterfacePtrThread,
+                   weak_ptr_factory_.GetWeakPtr(),
                    base::Passed(std::move(*message)),
                    base::Passed(std::move(forward_responder))));
     return true;
@@ -137,18 +112,17 @@ class ThreadSafeInterfacePtr : public MessageReceiverWithResponder,
 
   scoped_refptr<base::SingleThreadTaskRunner> interface_ptr_task_runner_;
   ProxyType proxy_;
-  AcceptCallback accept_callback_;
-  AcceptWithResponderCallback accept_with_responder_callback_;
-  InterfacePtr<Interface> interface_ptr_;
+  base::WeakPtrFactory<ThreadSafeInterfacePtrBase> weak_ptr_factory_;
 };
 
 struct ThreadSafeInterfacePtrDeleter {
   template <typename Interface>
-  static void Destruct(const ThreadSafeInterfacePtr<Interface>* interface_ptr) {
+  static void Destruct(
+      const ThreadSafeInterfacePtrBase<Interface>* interface_ptr) {
     interface_ptr->DeleteOnCorrectThread();
   }
 };
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_BINDINGS_THREAD_SAFE_INTERFACE_PTR_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_THREAD_SAFE_INTERFACE_PTR_BASE_H_