Mojo C++ bindings: introduce public associated-interface-related types.

mojo/public/cpp/bindings/associated_interface_request.h

Index: mojo/public/cpp/bindings/associated_interface_request.h
diff --git a/mojo/public/cpp/bindings/associated_interface_request.h b/mojo/public/cpp/bindings/associated_interface_request.h
index 9882b89062de893a45ee8345b5224c2f17bc4b43..96019a396db7c1558b6fae5fada96d417c23d67d 100644
--- a/mojo/public/cpp/bindings/associated_interface_request.h
+++ b/mojo/public/cpp/bindings/associated_interface_request.h
@@ -5,27 +5,83 @@
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_
 
-#include "mojo/public/cpp/system/macros.h"
+#include "base/macros.h"
+#include "mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h"
 
 namespace mojo {
 
-// Represents an associated interface request.
-// TODO(yzshen): implement it.
+namespace internal {
+class AssociatedInterfaceRequestHelper;
+}
+
+// AssociatedInterfaceRequest represents an associated interface request. It is
+// similar to InterfaceRequest except that it doesn't own a message pipe handle.
 template <typename Interface>
 class AssociatedInterfaceRequest {
-  MOJO_MOVE_ONLY_TYPE(AssociatedInterfaceRequest)
+  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(AssociatedInterfaceRequest);
 
  public:
+  // Constructs an empty AssociatedInterfaceRequest, representing that the
+  // client is not requesting an implementation of Interface.
   AssociatedInterfaceRequest() {}
-  AssociatedInterfaceRequest(AssociatedInterfaceRequest&& other) {}
+  AssociatedInterfaceRequest(decltype(nullptr)) {}
 
+  // Takes the interface endpoint handle from another
+  // AssociatedInterfaceRequest.
+  AssociatedInterfaceRequest(AssociatedInterfaceRequest&& other) {
+    handle_ = other.handle_.Pass();
+  }
   AssociatedInterfaceRequest& operator=(AssociatedInterfaceRequest&& other) {
+    if (this != &other)
+      handle_ = other.handle_.Pass();
+    return *this;
+  }
+
+  // Assigning to nullptr resets the AssociatedInterfaceRequest to an empty
+  // state, closing the interface endpoint handle currently bound to it (if
+  // any).
+  AssociatedInterfaceRequest& operator=(decltype(nullptr)) {
+    handle_.reset();
     return *this;
   }
 
-  bool is_pending() const { return false; }
+  // Indicates whether the request currently contains a valid interface endpoint
+  // handle.
+  bool is_pending() const { return handle_.is_valid(); }
+
+ private:
+  friend class internal::AssociatedInterfaceRequestHelper;
+
+  internal::ScopedInterfaceEndpointHandle handle_;
+};
+
+namespace internal {
+
+// With this helper, AssociatedInterfaceRequest doesn't have to expose any
+// operations related to ScopedInterfaceEndpointHandle, which is an internal
+// class.
+class AssociatedInterfaceRequestHelper {
+ public:
+  template <typename Interface>
+  static ScopedInterfaceEndpointHandle PassHandle(
+      AssociatedInterfaceRequest<Interface>* request) {
+    return request->handle_.Pass();
+  }
+
+  template <typename Interface>
+  static const ScopedInterfaceEndpointHandle& GetHandle(
+      AssociatedInterfaceRequest<Interface>* request) {
+    return request->handle_;
+  }
+
+  template <typename Interface>
+  static void SetHandle(AssociatedInterfaceRequest<Interface>* request,
+                        ScopedInterfaceEndpointHandle handle) {
+    request->handle_ = handle.Pass();
+  }
 };
 
+}  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_INTERFACE_REQUEST_H_