EDK: Remove Core::AddDispatcher().

mojo/edk/system/core_test_base.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_test_base.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/logging.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/core.h"
 #include "mojo/edk/system/dispatcher.h"
+#include "mojo/edk/system/handle.h"
 #include "mojo/edk/system/memory.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 
 using mojo::util::MutexLocker;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 namespace test {
@@ skipping 193 matching lines @@
 }
 
 void CoreTestBase::TearDown() {
   CHECK(core_);
   core_.reset();
 }
 
 MojoHandle CoreTestBase::CreateMockHandle(CoreTestBase::MockHandleInfo* info) {
   CHECK(core_);
   auto dispatcher = MockDispatcher::Create(info);
-  MojoHandle rv = core_->AddDispatcher(dispatcher.get());
+  MojoHandle rv = core_->AddHandle(
+      Handle(std::move(dispatcher),
+             MOJO_HANDLE_RIGHT_DUPLICATE | MOJO_HANDLE_RIGHT_TRANSFER |
+                 MOJO_HANDLE_RIGHT_READ | MOJO_HANDLE_RIGHT_WRITE |
+                 MOJO_HANDLE_RIGHT_EXECUTE));
   CHECK_NE(rv, MOJO_HANDLE_INVALID);
   return rv;
 }
 
 // CoreTestBase_MockHandleInfo -------------------------------------------------
 
 CoreTestBase_MockHandleInfo::CoreTestBase_MockHandleInfo() {}
 
 CoreTestBase_MockHandleInfo::~CoreTestBase_MockHandleInfo() {}
 
@@ skipping 189 matching lines @@
 }
 
 void CoreTestBase_MockHandleInfo::AwakableWasAdded(Awakable* awakable) {
   MutexLocker locker(&mutex_);
   added_awakables_.push_back(awakable);
 }
 
 }  // namespace test
 }  // namespace system
 }  // namespace mojo