| Index: base/memory/shared_memory_mac_unittest.cc
|
| diff --git a/base/memory/shared_memory_mac_unittest.cc b/base/memory/shared_memory_mac_unittest.cc
|
| index c7d20ec049358c92880d9237d6958f0959e9d17c..4ccee89deb46ff7aa56ce0057caaa69135c11329 100644
|
| --- a/base/memory/shared_memory_mac_unittest.cc
|
| +++ b/base/memory/shared_memory_mac_unittest.cc
|
| @@ -204,7 +204,7 @@ class SharedMemoryMacMultiProcessTest : public MultiProcessTest {
|
| // similar tests.
|
| service_name_ = CreateRandomServiceName();
|
| server_port_.reset(BecomeMachServer(service_name_.c_str()));
|
| - child_process_ = SpawnChild(name);
|
| + spawn_child_ = SpawnChild(name);
|
| client_port_.reset(ReceiveMachPort(server_port_.get()));
|
| }
|
|
|
| @@ -221,7 +221,7 @@ class SharedMemoryMacMultiProcessTest : public MultiProcessTest {
|
| // process.
|
| mac::ScopedMachSendRight client_port_;
|
|
|
| - base::Process child_process_;
|
| + base::SpawnChildResult spawn_child_;
|
| DISALLOW_COPY_AND_ASSIGN(SharedMemoryMacMultiProcessTest);
|
| };
|
|
|
| @@ -237,7 +237,7 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachBasedSharedMemory) {
|
| SendMachPort(client_port_.get(), shared_memory->handle().GetMemoryObject(),
|
| MACH_MSG_TYPE_COPY_SEND);
|
| int rv = -1;
|
| - ASSERT_TRUE(child_process_.WaitForExitWithTimeout(
|
| + ASSERT_TRUE(spawn_child_.process.WaitForExitWithTimeout(
|
| TestTimeouts::action_timeout(), &rv));
|
| EXPECT_EQ(0, rv);
|
| }
|
| @@ -277,7 +277,7 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachBasedSharedMemoryWithOffset) {
|
| SendMachPort(
|
| client_port_.get(), shm.GetMemoryObject(), MACH_MSG_TYPE_COPY_SEND);
|
| int rv = -1;
|
| - ASSERT_TRUE(child_process_.WaitForExitWithTimeout(
|
| + ASSERT_TRUE(spawn_child_.process.WaitForExitWithTimeout(
|
| TestTimeouts::action_timeout(), &rv));
|
| EXPECT_EQ(0, rv);
|
| }
|
|
|