EDK: Remove Core::AddDispatcher().

mojo/edk/system/remote_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 tests both |RemoteProducerDataPipeImpl| and
 // |RemoteConsumerDataPipeImpl|.
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 159 matching lines @@
   DispatcherVector read_dispatchers;
   uint32_t read_num_dispatchers = 10;  // Maximum to get.
   Waiter waiter;
   HandleSignalsState hss;
   uint32_t context = 0;
 
   RefPtr<DataPipe> dp(CreateLocal(sizeof(int32_t), 1000));
   // This is the consumer dispatcher we'll send.
   auto consumer = DataPipeConsumerDispatcher::Create();
   consumer->Init(dp.Clone());
-  Handle consumer_handle(std::move(consumer), MOJO_HANDLE_RIGHT_TRANSFER |
-                                                  MOJO_HANDLE_RIGHT_READ |
-                                                  MOJO_HANDLE_RIGHT_WRITE);
+  Handle consumer_handle(std::move(consumer),
+                         DataPipeConsumerDispatcher::kDefaultHandleRights);
 
   // Write to the producer and close it, before sending the consumer.
   int32_t elements[10] = {123};
   uint32_t num_bytes = static_cast<uint32_t>(1u * sizeof(elements[0]));
   EXPECT_EQ(MOJO_RESULT_OK,
             dp->ProducerWriteData(UserPointer<const void>(elements),
                                   MakeUserPointer(&num_bytes), false));
   EXPECT_EQ(1u * sizeof(elements[0]), num_bytes);
   dp->ProducerClose();
 
@@ skipping 100 matching lines @@
   DispatcherVector read_dispatchers;
   uint32_t read_num_dispatchers = 10;  // Maximum to get.
   Waiter waiter;
   HandleSignalsState hss;
   uint32_t context = 0;
 
   RefPtr<DataPipe> dp(CreateLocal(sizeof(int32_t), 1000));
   // This is the consumer dispatcher we'll send.
   auto consumer = DataPipeConsumerDispatcher::Create();
   consumer->Init(dp.Clone());
-  Handle consumer_handle(std::move(consumer), MOJO_HANDLE_RIGHT_TRANSFER |
-                                                  MOJO_HANDLE_RIGHT_READ |
-                                                  MOJO_HANDLE_RIGHT_WRITE);
+  Handle consumer_handle(std::move(consumer),
+                         DataPipeConsumerDispatcher::kDefaultHandleRights);
 
   void* write_ptr = nullptr;
   uint32_t num_bytes = 0u;
   EXPECT_EQ(MOJO_RESULT_OK,
             dp->ProducerBeginWriteData(MakeUserPointer(&write_ptr),
                                        MakeUserPointer(&num_bytes)));
   ASSERT_GE(num_bytes, 1u * sizeof(int32_t));
 
   // Write the consumer to MP 0 (port 0). Wait and receive on MP 1 (port 0).
   // (Add the waiter first, to avoid any handling the case where it's already
@@ skipping 92 matching lines @@
   DispatcherVector read_dispatchers;
   uint32_t read_num_dispatchers = 10;  // Maximum to get.
   Waiter waiter;
   HandleSignalsState hss;
   uint32_t context = 0;
 
   RefPtr<DataPipe> dp(CreateLocal(sizeof(int32_t), 1000));
   // This is the consumer dispatcher we'll send.
   auto consumer = DataPipeConsumerDispatcher::Create();
   consumer->Init(dp.Clone());
-  Handle consumer_handle(std::move(consumer), MOJO_HANDLE_RIGHT_TRANSFER |
-                                                  MOJO_HANDLE_RIGHT_READ |
-                                                  MOJO_HANDLE_RIGHT_WRITE);
+  Handle consumer_handle(std::move(consumer),
+                         DataPipeConsumerDispatcher::kDefaultHandleRights);
 
   void* write_ptr = nullptr;
   uint32_t num_bytes = 0u;
   EXPECT_EQ(MOJO_RESULT_OK,
             dp->ProducerBeginWriteData(MakeUserPointer(&write_ptr),
                                        MakeUserPointer(&num_bytes)));
   ASSERT_GE(num_bytes, 1u * sizeof(int32_t));
   *static_cast<int32_t*>(write_ptr) = 123456;
   EXPECT_EQ(MOJO_RESULT_OK, dp->ProducerEndWriteData(
                                 static_cast<uint32_t>(1u * sizeof(int32_t))));
@@ skipping 91 matching lines @@
   EXPECT_EQ(123456, elements[0]);
   EXPECT_EQ(789012, elements[1]);
   EXPECT_EQ(0, elements[2]);
 
   consumer->Close();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo