Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1519)

Unified Diff: ipc/attachment_broker_mac_unittest.cc

Issue 1411523006: mac: Make Mach port scopers better ScopedGenerics (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/child_io_surface_manager_mac.cc ('k') | ipc/attachment_broker_privileged_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/attachment_broker_mac_unittest.cc
diff --git a/ipc/attachment_broker_mac_unittest.cc b/ipc/attachment_broker_mac_unittest.cc
index a801b1069b6732f809add5a172cc3f240d9bfe43..8f2aad0b5e87b43678a09cafd5c91902af5439c9 100644
--- a/ipc/attachment_broker_mac_unittest.cc
+++ b/ipc/attachment_broker_mac_unittest.cc
@@ -383,8 +383,9 @@ class IPCAttachmentBrokerMacTest : public IPCTestBase {
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_);
}
@@ -470,14 +471,15 @@ scoped_ptr<ChildProcessGlobals> CommonChildProcessSetUp() {
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;
« no previous file with comments | « content/child/child_io_surface_manager_mac.cc ('k') | ipc/attachment_broker_privileged_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698