EDK: Replace HandleTable::GetDispatcher() with GetHandle().

mojo/edk/system/handle_table_unittest.cc

 // Copyright 2016 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/handle_table.h"
 
 #include <vector>
 
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/edk/system/handle.h"
 #include "mojo/edk/system/mock_simple_dispatcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::util::MakeRefCounted;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 namespace {
 
 TEST(HandleTableTest, Basic) {
   HandleTable ht(1000u);
 
   RefPtr<Dispatcher> d = MakeRefCounted<test::MockSimpleDispatcher>();
 
-  MojoHandle h = ht.AddHandle(Handle(d.Clone(), MOJO_HANDLE_RIGHT_NONE));
-  ASSERT_NE(h, MOJO_HANDLE_INVALID);
+  MojoHandle hv = ht.AddHandle(Handle(d.Clone(), MOJO_HANDLE_RIGHT_NONE));
+  ASSERT_NE(hv, MOJO_HANDLE_INVALID);
 
   // Save the pointer value (without taking a ref), so we can check that we get
   // the same object back.
   Dispatcher* dv = d.get();
   // Reset this, to make sure that the handle table takes a ref.
   d = nullptr;
 
-  EXPECT_EQ(MOJO_RESULT_OK, ht.GetDispatcher(h, &d));
-  EXPECT_EQ(d.get(), dv);
+  Handle h;
+  EXPECT_EQ(MOJO_RESULT_OK, ht.GetHandle(hv, &h));
+  EXPECT_EQ(dv, h.dispatcher.get());
 
   d = nullptr;
-  ASSERT_EQ(MOJO_RESULT_OK, ht.GetAndRemoveDispatcher(h, &d));
-  ASSERT_EQ(d.get(), dv);
+  ASSERT_EQ(MOJO_RESULT_OK, ht.GetAndRemoveDispatcher(hv, &d));
+  ASSERT_EQ(dv, d.get());
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 
-  // We removed |h|, so it should no longer be valid.
-  d = nullptr;
-  EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, ht.GetDispatcher(h, &d));
+  // We removed |hv|, so it should no longer be valid.
+  h.reset();
+  EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, ht.GetHandle(hv, &h));
 }
 
 TEST(HandleTableTest, AddHandlePair) {
   HandleTable ht(1000u);
 
   auto d1 = MakeRefCounted<test::MockSimpleDispatcher>();
   auto d2 = MakeRefCounted<test::MockSimpleDispatcher>();
 
   auto hp = ht.AddHandlePair(Handle(d1.Clone(), MOJO_HANDLE_RIGHT_NONE),
                              Handle(d2.Clone(), MOJO_HANDLE_RIGHT_NONE));
@@ skipping 183 matching lines @@
     ASSERT_EQ(dispatchers[i], d) << i;
   }
 
   for (size_t i = 0u; i < kNumHandles; i++)
     EXPECT_EQ(MOJO_RESULT_OK, dispatchers[i]->Close()) << i;
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo