mac: Make Mach port scopers better ScopedGenerics

ipc/attachment_broker_mac_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.
 
 #include "build/build_config.h"
 
 #include <fcntl.h>
 #include <sys/mman.h>
 
 #include "base/command_line.h"
@@ skipping 365 matching lines @@
 
     if (!broker_.get())
       SetBroker(new IPC::AttachmentBrokerUnprivilegedMac);
 
     broker_->AddObserver(&observer_);
     CreateChannel(&proxy_listener_);
     broker_->DesignateBrokerCommunicationChannel(channel());
     ASSERT_TRUE(ConnectChannel());
     ASSERT_TRUE(StartClient());
 
-    client_port_.reset(IPC::ReceiveMachPort(server_port_).release());
-    IPC::SendMachPort(client_port_, mach_task_self(), MACH_MSG_TYPE_COPY_SEND);
+    client_port_.reset(IPC::ReceiveMachPort(server_port_.get()).release());
+    IPC::SendMachPort(
+        client_port_.get(), mach_task_self(), MACH_MSG_TYPE_COPY_SEND);
     active_names_at_start_ = IPC::GetActiveNameCount();
     get_proxy_listener()->set_listener(&result_listener_);
   }
 
   void CheckChildResult() {
     ASSERT_EQ(ProxyListener::MESSAGE_RECEIVED,
               get_proxy_listener()->get_reason());
     ASSERT_EQ(get_result_listener()->get_result(), RESULT_SUCCESS);
   }
 
@@ skipping 65 matching lines @@
 // globals that must live at least as long as the test.
 scoped_ptr<ChildProcessGlobals> CommonChildProcessSetUp() {
   base::CommandLine cmd_line = *base::CommandLine::ForCurrentProcess();
   std::string service_name =
       cmd_line.GetSwitchValueASCII(g_service_switch_name);
   base::mac::ScopedMachSendRight server_port(
       IPC::LookupServer(service_name.c_str()));
   base::mac::ScopedMachReceiveRight client_port(IPC::MakeReceivingPort());
 
   // Send the port that this process is listening on to the server.
-  IPC::SendMachPort(server_port, client_port, MACH_MSG_TYPE_MAKE_SEND);
+  IPC::SendMachPort(
+      server_port.get(), client_port.get(), MACH_MSG_TYPE_MAKE_SEND);
 
   // Receive the task port of the server process.
   base::mac::ScopedMachSendRight server_task_port(
-      IPC::ReceiveMachPort(client_port));
+      IPC::ReceiveMachPort(client_port.get()));
 
   scoped_ptr<ChildProcessGlobals> globals(new ChildProcessGlobals);
-  globals->port_provider.InsertEntry(getppid(), server_task_port);
+  globals->port_provider.InsertEntry(getppid(), server_task_port.get());
   globals->broker.SetPortProvider(&globals->port_provider);
   globals->server_task_port.reset(server_task_port.release());
   return globals;
 }
 
 int CommonPrivilegedProcessMain(OnMessageReceivedCallback callback,
                                 const char* channel_name) {
   LOG(INFO) << "Privileged process start.";
   scoped_ptr<ChildProcessGlobals> globals(CommonChildProcessSetUp());
 
@@ skipping 338 matching lines @@
   // Do nothing special. The default behavior already runs the
   // AttachmentBrokerPrivilegedMac.
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendSharedMemoryHandleToSelf) {
   return CommonPrivilegedProcessMain(&SendSharedMemoryHandleToSelfCallback,
                                      "SendSharedMemoryHandleToSelf");
 }
 
 }  // namespace