EDK: Remove Core::AddDispatcher().

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 367 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);
+    Handle handle_to_send(std::move(to_send),
+                          DataPipeProducerDispatcher::kDefaultHandleRights);
     RefPtr<Dispatcher> to_receive;
     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()));
@@ skipping 29 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);
+    Handle handle_to_send(std::move(to_send),
+                          DataPipeConsumerDispatcher::kDefaultHandleRights);
     RefPtr<Dispatcher> to_receive;
     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()));
@@ skipping 34 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);
+    Handle handle_to_send(std::move(to_send),
+                          DataPipeProducerDispatcher::kDefaultHandleRights);
     RefPtr<Dispatcher> to_receive;
     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());
-    handle_to_send = Handle(std::move(to_receive), MOJO_HANDLE_RIGHT_TRANSFER |
-                                                       MOJO_HANDLE_RIGHT_READ |
-                                                       MOJO_HANDLE_RIGHT_WRITE);
+    handle_to_send = Handle(std::move(to_receive),
+                            DataPipeProducerDispatcher::kDefaultHandleRights);
 
     // Now send it back the other way.
     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>(
@@ skipping 17 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);
+    Handle handle_to_send(std::move(to_send),
+                          DataPipeConsumerDispatcher::kDefaultHandleRights);
     RefPtr<Dispatcher> to_receive;
     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());
-    handle_to_send = Handle(std::move(to_receive), MOJO_HANDLE_RIGHT_TRANSFER |
-                                                       MOJO_HANDLE_RIGHT_READ |
-                                                       MOJO_HANDLE_RIGHT_WRITE);
+    handle_to_send = Handle(std::move(to_receive),
+                            DataPipeConsumerDispatcher::kDefaultHandleRights);
 
     // Now send it back the other way.
     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>(
@@ skipping 2371 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