| Index: ipc/attachment_broker_mac_unittest.cc
|
| diff --git a/ipc/attachment_broker_mac_unittest.cc b/ipc/attachment_broker_mac_unittest.cc
|
| index 9736c02550c15224d8aa0de74571088620df172e..ff8596e6aa5c203802c738473c9a1b0d36f25db1 100644
|
| --- a/ipc/attachment_broker_mac_unittest.cc
|
| +++ b/ipc/attachment_broker_mac_unittest.cc
|
| @@ -111,7 +111,7 @@ base::SharedMemoryHandle GetSharedMemoryHandleFromMsg1(
|
| return base::SharedMemoryHandle();
|
| }
|
|
|
| - return base::get<1>(p);
|
| + return std::get<1>(p);
|
| }
|
|
|
| // |message| must be deserializable as a TestSharedMemoryHandleMsg2. Returns
|
| @@ -132,8 +132,8 @@ bool GetSharedMemoryHandlesFromMsg2(const IPC::Message& message,
|
| return false;
|
| }
|
|
|
| - *handle1 = base::get<0>(p);
|
| - *handle2 = base::get<1>(p);
|
| + *handle1 = std::get<0>(p);
|
| + *handle2 = std::get<1>(p);
|
| return true;
|
| }
|
|
|
| @@ -868,16 +868,16 @@ void SendPosixFDAndMachPortCallback(IPC::Sender* sender,
|
| return;
|
| }
|
|
|
| - base::SharedMemoryHandle handle1 = base::get<1>(p);
|
| - base::SharedMemoryHandle handle2 = base::get<3>(p);
|
| + base::SharedMemoryHandle handle1 = std::get<1>(p);
|
| + base::SharedMemoryHandle handle2 = std::get<3>(p);
|
| bool success1 = CheckContentsOfSharedMemoryHandle(handle1, kDataBuffer1) &&
|
| CheckContentsOfSharedMemoryHandle(handle2, kDataBuffer2);
|
| if (!success1)
|
| LOG(ERROR) << "SharedMemoryHandles have wrong contents.";
|
|
|
| bool success2 =
|
| - CheckContentsOfFileDescriptor(base::get<0>(p), kDataBuffer3) &&
|
| - CheckContentsOfFileDescriptor(base::get<2>(p), kDataBuffer4);
|
| + CheckContentsOfFileDescriptor(std::get<0>(p), kDataBuffer3) &&
|
| + CheckContentsOfFileDescriptor(std::get<2>(p), kDataBuffer4);
|
| if (!success2)
|
| LOG(ERROR) << "FileDescriptors have wrong contents.";
|
|
|
|
|