EDK: Add MojoHandleRights to DispatcherTransport.

mojo/edk/system/data_pipe_impl_unittest.cc

 // 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.
 
 // This file contains tests that are shared between different implementations of
 // |DataPipeImpl|.
 
 #include "mojo/edk/system/data_pipe_impl.h"
 
 #include <stdint.h>
@@ skipping 247 matching lines @@
   }
 
   void Create(const MojoCreateDataPipeOptions& validated_options) override {
     CHECK(!dp_);
     dp_ = DataPipe::CreateLocal(validated_options);
   }
 
   bool IsStrictCircularBuffer() const override { return false; }
 
  protected:
-  void SendDispatcher(size_t source_i,
-                      RefPtr<Dispatcher> to_send,
-                      RefPtr<Dispatcher>* to_receive) {
+  // TODO(vtl): |to_receive| should be a |Handle*| too.
+  void SendHandle(size_t source_i,
+                  const Handle& to_send,
+                  RefPtr<Dispatcher>* to_receive) {
     DCHECK(source_i == 0 || source_i == 1);
     size_t dest_i = source_i ^ 1;
 
     // Write the dispatcher to MP |source_i| (port 0). Wait and receive on MP
     // |dest_i| (port 0). (Add the waiter first, to avoid any handling the case
     // where it's already readable.)
     Waiter waiter;
     waiter.Init();
     ASSERT_EQ(MOJO_RESULT_OK,
               message_pipe(dest_i)->AddAwakable(
                   0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, 987, nullptr));
     {
-      DispatcherTransport transport(
-          test::DispatcherTryStartTransport(to_send.get()));
+      DispatcherTransport transport(test::HandleTryStartTransport(to_send));
       ASSERT_TRUE(transport.is_valid());
 
       std::vector<DispatcherTransport> transports;
       transports.push_back(transport);
       ASSERT_EQ(MOJO_RESULT_OK, message_pipe(source_i)->WriteMessage(
                                     0, NullUserPointer(), 0, &transports,
                                     MOJO_WRITE_MESSAGE_FLAG_NONE));
       transport.End();
     }
     uint32_t context = 0;
@@ skipping 83 matching lines @@
 class RemoteProducerDataPipeImplTestHelper
     : public RemoteDataPipeImplTestHelper {
  public:
   RemoteProducerDataPipeImplTestHelper() {}
   ~RemoteProducerDataPipeImplTestHelper() override {}
 
   void DoTransfer() override {
     // This is the producer dispatcher we'll send.
     auto to_send = DataPipeProducerDispatcher::Create();
     to_send->Init(dp());
+    Handle handle_to_send(std::move(to_send), MOJO_HANDLE_RIGHT_TRANSFER |
+                                                  MOJO_HANDLE_RIGHT_READ |
+                                                  MOJO_HANDLE_RIGHT_WRITE);
     RefPtr<Dispatcher> to_receive;
-    SendDispatcher(0, to_send, &to_receive);
-    // |to_send| should have been closed. This is |DCHECK()|ed when it is
-    // destroyed.
-    EXPECT_TRUE(to_send->HasOneRef());
-    to_send = nullptr;
+    SendHandle(0, handle_to_send, &to_receive);
+    // |handle_to_send.dispatcher| should have been closed. This is |DCHECK()|ed
+    // when it is destroyed.
+    EXPECT_TRUE(handle_to_send.dispatcher->HasOneRef());
+    handle_to_send.reset();
 
     ASSERT_EQ(Dispatcher::Type::DATA_PIPE_PRODUCER, to_receive->GetType());
     producer_dispatcher_ = RefPtr<DataPipeProducerDispatcher>(
         static_cast<DataPipeProducerDispatcher*>(to_receive.get()));
   }
 
   DataPipe* DataPipeForProducer() override {
     if (producer_dispatcher_)
       return producer_dispatcher_->GetDataPipeForTest();
     return dp().get();
@@ skipping 23 matching lines @@
 class RemoteConsumerDataPipeImplTestHelper
     : public RemoteDataPipeImplTestHelper {
  public:
   RemoteConsumerDataPipeImplTestHelper() {}
   ~RemoteConsumerDataPipeImplTestHelper() override {}
 
   void DoTransfer() override {
     // This is the consumer dispatcher we'll send.
     auto to_send = DataPipeConsumerDispatcher::Create();
     to_send->Init(dp());
+    Handle handle_to_send(std::move(to_send), MOJO_HANDLE_RIGHT_TRANSFER |
+                                                  MOJO_HANDLE_RIGHT_READ |
+                                                  MOJO_HANDLE_RIGHT_WRITE);
     RefPtr<Dispatcher> to_receive;
-    SendDispatcher(0, to_send, &to_receive);
-    // |to_send| should have been closed. This is |DCHECK()|ed when it is
-    // destroyed.
-    EXPECT_TRUE(to_send->HasOneRef());
-    to_send = nullptr;
+    SendHandle(0, handle_to_send, &to_receive);
+    // |handle_to_send.dispatcher| should have been closed. This is |DCHECK()|ed
+    // when it is destroyed.
+    EXPECT_TRUE(handle_to_send.dispatcher->HasOneRef());
+    handle_to_send.reset();
 
     ASSERT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, to_receive->GetType());
     consumer_dispatcher_ = RefPtr<DataPipeConsumerDispatcher>(
         static_cast<DataPipeConsumerDispatcher*>(to_receive.get()));
   }
 
   DataPipe* DataPipeForProducer() override { return dp().get(); }
   DataPipe* DataPipeForConsumer() override {
     if (consumer_dispatcher_)
       return consumer_dispatcher_->GetDataPipeForTest();
@@ skipping 28 matching lines @@
 class RemoteProducerDataPipeImplTestHelper2
     : public RemoteProducerDataPipeImplTestHelper {
  public:
   RemoteProducerDataPipeImplTestHelper2() {}
   ~RemoteProducerDataPipeImplTestHelper2() override {}
 
   void DoTransfer() override {
     // This is the producer dispatcher we'll send.
     auto to_send = DataPipeProducerDispatcher::Create();
     to_send->Init(dp());
+    Handle handle_to_send(std::move(to_send), MOJO_HANDLE_RIGHT_TRANSFER |
+                                                  MOJO_HANDLE_RIGHT_READ |
+                                                  MOJO_HANDLE_RIGHT_WRITE);
     RefPtr<Dispatcher> to_receive;
-    SendDispatcher(0, to_send, &to_receive);
-    // |to_send| should have been closed. This is |DCHECK()|ed when it is
-    // destroyed.
-    EXPECT_TRUE(to_send->HasOneRef());
-    to_send = nullptr;
+    SendHandle(0, handle_to_send, &to_receive);
+    // |handle_to_send.dispatcher| should have been closed. This is |DCHECK()|ed
+    // when it is destroyed.
+    EXPECT_TRUE(handle_to_send.dispatcher->HasOneRef());
+    handle_to_send.reset();
     ASSERT_EQ(Dispatcher::Type::DATA_PIPE_PRODUCER, to_receive->GetType());
-    to_send = RefPtr<DataPipeProducerDispatcher>(
-        static_cast<DataPipeProducerDispatcher*>(to_receive.get()));
-    to_receive = nullptr;
+    handle_to_send = Handle(std::move(to_receive), MOJO_HANDLE_RIGHT_TRANSFER |
+                                                       MOJO_HANDLE_RIGHT_READ |
+                                                       MOJO_HANDLE_RIGHT_WRITE);
 
     // Now send it back the other way.
-    SendDispatcher(1, to_send, &to_receive);
-    // |producer_dispatcher_| should have been closed. This is |DCHECK()|ed when
-    // it is destroyed.
-    EXPECT_TRUE(to_send->HasOneRef());
-    to_send = nullptr;
+    SendHandle(1, handle_to_send, &to_receive);
+    // |handle_to_send.dispatcher| should have been closed. This is |DCHECK()|ed
+    // when it is destroyed.
+    EXPECT_TRUE(handle_to_send.dispatcher->HasOneRef());
+    handle_to_send.reset();
 
     ASSERT_EQ(Dispatcher::Type::DATA_PIPE_PRODUCER, to_receive->GetType());
     producer_dispatcher_ = RefPtr<DataPipeProducerDispatcher>(
         static_cast<DataPipeProducerDispatcher*>(to_receive.get()));
   }
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(RemoteProducerDataPipeImplTestHelper2);
 };
 
@@ skipping 10 matching lines @@
 class RemoteConsumerDataPipeImplTestHelper2
     : public RemoteConsumerDataPipeImplTestHelper {
  public:
   RemoteConsumerDataPipeImplTestHelper2() {}
   ~RemoteConsumerDataPipeImplTestHelper2() override {}
 
   void DoTransfer() override {
     // This is the consumer dispatcher we'll send.
     auto to_send = DataPipeConsumerDispatcher::Create();
     to_send->Init(dp());
+    Handle handle_to_send(std::move(to_send), MOJO_HANDLE_RIGHT_TRANSFER |
+                                                  MOJO_HANDLE_RIGHT_READ |
+                                                  MOJO_HANDLE_RIGHT_WRITE);
     RefPtr<Dispatcher> to_receive;
-    SendDispatcher(0, to_send, &to_receive);
-    // |to_send| should have been closed. This is |DCHECK()|ed when it is
-    // destroyed.
-    EXPECT_TRUE(to_send->HasOneRef());
-    to_send = nullptr;
+    SendHandle(0, handle_to_send, &to_receive);
+    // |handle_to_send.dispatcher| should have been closed. This is |DCHECK()|ed
+    // when it is destroyed.
+    EXPECT_TRUE(handle_to_send.dispatcher->HasOneRef());
+    handle_to_send.reset();
     ASSERT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, to_receive->GetType());
-    to_send = RefPtr<DataPipeConsumerDispatcher>(
-        static_cast<DataPipeConsumerDispatcher*>(to_receive.get()));
-    to_receive = nullptr;
+    handle_to_send = Handle(std::move(to_receive), MOJO_HANDLE_RIGHT_TRANSFER |
+                                                       MOJO_HANDLE_RIGHT_READ |
+                                                       MOJO_HANDLE_RIGHT_WRITE);
 
     // Now send it back the other way.
-    SendDispatcher(1, to_send, &to_receive);
-    // |consumer_dispatcher_| should have been closed. This is |DCHECK()|ed when
-    // it is destroyed.
-    EXPECT_TRUE(to_send->HasOneRef());
-    to_send = nullptr;
+    SendHandle(1, handle_to_send, &to_receive);
+    // |handle_to_send.dispatcher| should have been closed. This is |DCHECK()|ed
+    // when it is destroyed.
+    EXPECT_TRUE(handle_to_send.dispatcher->HasOneRef());
+    handle_to_send.reset();
 
     ASSERT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, to_receive->GetType());
     consumer_dispatcher_ = RefPtr<DataPipeConsumerDispatcher>(
         static_cast<DataPipeConsumerDispatcher*>(to_receive.get()));
   }
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(RemoteConsumerDataPipeImplTestHelper2);
 };
 
@@ skipping 2364 matching lines @@
                 &waiter, MOJO_HANDLE_SIGNAL_READ_THRESHOLD, 0, &hss));
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
 
   this->ConsumerClose();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo