EDK: Remove Core::GetDispatcher().

mojo/edk/system/core.cc

 // Copyright 2013 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.
 
 #include "mojo/edk/system/core.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 87 matching lines @@
 }
 
 MojoResult Core::GetHandle(MojoHandle handle, Handle* h) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   MutexLocker locker(&handle_table_mutex_);
   return handle_table_.GetHandle(handle, h);
 }
 
-MojoResult Core::GetDispatcher(MojoHandle handle,
-                               RefPtr<Dispatcher>* dispatcher) {
-  Handle h;
-  MojoResult result = GetHandle(handle, &h);
-  if (result == MOJO_RESULT_OK)
-    *dispatcher = std::move(h.dispatcher);
-  return result;
-}
-
 MojoResult Core::GetAndRemoveDispatcher(MojoHandle handle,
                                         RefPtr<Dispatcher>* dispatcher) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   MutexLocker locker(&handle_table_mutex_);
   Handle h;
   MojoResult result = handle_table_.GetAndRemoveHandle(handle, &h);
   if (result == MOJO_RESULT_OK)
     *dispatcher = std::move(h.dispatcher);
   return result;
 }
 
 MojoResult Core::GetDispatcherAndCheckRights(
     MojoHandle handle,
     MojoHandleRights required_handle_rights,
     EntrypointClass entrypoint_class,
     util::RefPtr<Dispatcher>* dispatcher) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   Handle h;
   MojoResult result = GetHandle(handle, &h);
   if (result != MOJO_RESULT_OK)
     return result;
 
-  if ((h.rights & required_handle_rights) != required_handle_rights) {
+  if (!h.has_all_rights(required_handle_rights)) {
     return h.dispatcher->SupportsEntrypointClass(entrypoint_class)
                ? MOJO_RESULT_PERMISSION_DENIED
                : MOJO_RESULT_INVALID_ARGUMENT;
   }
 
   *dispatcher = std::move(h.dispatcher);
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::AsyncWait(MojoHandle handle,
@@ skipping 463 matching lines @@
     MojoHandle buffer_handle,
     UserPointer<const MojoDuplicateBufferHandleOptions> options,
     UserPointer<MojoHandle> new_buffer_handle) {
   // TODO(vtl): This is a big ugly and duplicates some code, but the plan is to
   // remove this method anyway.
   Handle h;
   MojoResult result = GetHandle(buffer_handle, &h);
   if (result != MOJO_RESULT_OK)
     return result;
 
-  if (!(h.rights & MOJO_HANDLE_RIGHT_DUPLICATE)) {
+  if (!h.has_all_rights(MOJO_HANDLE_RIGHT_DUPLICATE)) {
     return h.dispatcher->SupportsEntrypointClass(EntrypointClass::BUFFER)
                ? MOJO_RESULT_PERMISSION_DENIED
                : MOJO_RESULT_INVALID_ARGUMENT;
   }
 
   // Don't verify |options| here; that's the dispatcher's job.
   RefPtr<Dispatcher> new_dispatcher;
   result = h.dispatcher->DuplicateBufferHandle(options, &new_dispatcher);
   if (result != MOJO_RESULT_OK)
     return result;
@@ skipping 124 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return result;
 }
 
 }  // namespace system
 }  // namespace mojo