EDK: HandleTransport::CreateEquivalentDispatcherAndClose() -> CreateEquivalentHandleAndClose().

mojo/edk/system/platform_handle_dispatcher_unittest.cc

 // Copyright 2014 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/platform_handle_dispatcher.h"
 
 #include <stdio.h>
 
 #include <utility>
 
@@ skipping 80 matching lines @@
   test::ScopedTestDir test_dir;
 
   static const char kFooBar[] = "foo bar";
 
   util::ScopedFILE fp(test_dir.CreateFile());
   EXPECT_EQ(sizeof(kFooBar), fwrite(kFooBar, 1, sizeof(kFooBar), fp.get()));
 
   auto dispatcher =
       PlatformHandleDispatcher::Create(PlatformHandleFromFILE(std::move(fp)));
   // TODO(vtl): Are these the correct rights for a |PlatformHandleDispatcher|?
-  Handle handle(std::move(dispatcher), MOJO_HANDLE_RIGHT_TRANSFER |
-                                           MOJO_HANDLE_RIGHT_READ |
-                                           MOJO_HANDLE_RIGHT_WRITE);
+  const MojoHandleRights kRights = MOJO_HANDLE_RIGHT_TRANSFER |
+                                   MOJO_HANDLE_RIGHT_READ |
+                                   MOJO_HANDLE_RIGHT_WRITE;
+  Handle handle(std::move(dispatcher), kRights);
 
   HandleTransport transport(test::HandleTryStartTransport(handle));
   EXPECT_TRUE(transport.is_valid());
   EXPECT_EQ(Dispatcher::Type::PLATFORM_HANDLE, transport.GetType());
   EXPECT_FALSE(transport.IsBusy());
 
-  auto generic_dispatcher =
-      transport.CreateEquivalentDispatcherAndClose(nullptr, 0u);
-  ASSERT_TRUE(generic_dispatcher);
+  Handle equivalent_handle =
+      transport.CreateEquivalentHandleAndClose(nullptr, 0u);
+  ASSERT_TRUE(equivalent_handle.dispatcher);
+  EXPECT_EQ(kRights, equivalent_handle.rights);
 
   transport.End();
   EXPECT_TRUE(handle.dispatcher->HasOneRef());
   handle.reset();
 
-  ASSERT_EQ(Dispatcher::Type::PLATFORM_HANDLE, generic_dispatcher->GetType());
-  dispatcher = RefPtr<PlatformHandleDispatcher>(
-      static_cast<PlatformHandleDispatcher*>(generic_dispatcher.get()));
+  ASSERT_EQ(Dispatcher::Type::PLATFORM_HANDLE,
+            equivalent_handle.dispatcher->GetType());
+  dispatcher =
+      RefPtr<PlatformHandleDispatcher>(static_cast<PlatformHandleDispatcher*>(
+          equivalent_handle.dispatcher.get()));
 
   fp = FILEFromPlatformHandle(dispatcher->PassPlatformHandle(), "rb");
   EXPECT_TRUE(fp);
 
   rewind(fp.get());
   char read_buffer[1000] = {};
   EXPECT_EQ(sizeof(kFooBar),
             fread(read_buffer, 1, sizeof(read_buffer), fp.get()));
   EXPECT_STREQ(kFooBar, read_buffer);
 
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo