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

Side by Side Diff: ipc/attachment_broker_mac_unittest.cc

Issue 1770013002: Replace base::Tuple in //ipc with std::tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +#include Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | ipc/attachment_broker_privileged_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include <fcntl.h> 7 #include <fcntl.h>
8 #include <mach/mach_vm.h> 8 #include <mach/mach_vm.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <sys/mman.h> 10 #include <sys/mman.h>
11 11
12 #include <tuple>
13
12 #include "base/command_line.h" 14 #include "base/command_line.h"
13 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
14 #include "base/files/scoped_file.h" 16 #include "base/files/scoped_file.h"
15 #include "base/files/scoped_temp_dir.h" 17 #include "base/files/scoped_temp_dir.h"
16 #include "base/mac/mac_util.h" 18 #include "base/mac/mac_util.h"
17 #include "base/mac/mach_logging.h" 19 #include "base/mac/mach_logging.h"
18 #include "base/memory/scoped_ptr.h" 20 #include "base/memory/scoped_ptr.h"
19 #include "base/memory/shared_memory.h" 21 #include "base/memory/shared_memory.h"
20 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
21 #include "base/synchronization/spin_wait.h" 23 #include "base/synchronization/spin_wait.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 LOG(ERROR) << "Message missing brokerable attachment."; 106 LOG(ERROR) << "Message missing brokerable attachment.";
105 return base::SharedMemoryHandle(); 107 return base::SharedMemoryHandle();
106 } 108 }
107 109
108 TestSharedMemoryHandleMsg1::Schema::Param p; 110 TestSharedMemoryHandleMsg1::Schema::Param p;
109 if (!TestSharedMemoryHandleMsg1::Read(&message, &p)) { 111 if (!TestSharedMemoryHandleMsg1::Read(&message, &p)) {
110 LOG(ERROR) << "Failed to deserialize message."; 112 LOG(ERROR) << "Failed to deserialize message.";
111 return base::SharedMemoryHandle(); 113 return base::SharedMemoryHandle();
112 } 114 }
113 115
114 return base::get<1>(p); 116 return std::get<1>(p);
115 } 117 }
116 118
117 // |message| must be deserializable as a TestSharedMemoryHandleMsg2. Returns 119 // |message| must be deserializable as a TestSharedMemoryHandleMsg2. Returns
118 // whether deserialization was successful. |handle1| and |handle2| are output 120 // whether deserialization was successful. |handle1| and |handle2| are output
119 // variables populated on success. 121 // variables populated on success.
120 bool GetSharedMemoryHandlesFromMsg2(const IPC::Message& message, 122 bool GetSharedMemoryHandlesFromMsg2(const IPC::Message& message,
121 base::SharedMemoryHandle* handle1, 123 base::SharedMemoryHandle* handle1,
122 base::SharedMemoryHandle* handle2) { 124 base::SharedMemoryHandle* handle2) {
123 // Expect a message with a brokered attachment. 125 // Expect a message with a brokered attachment.
124 if (!message.HasBrokerableAttachments()) { 126 if (!message.HasBrokerableAttachments()) {
125 LOG(ERROR) << "Message missing brokerable attachment."; 127 LOG(ERROR) << "Message missing brokerable attachment.";
126 return false; 128 return false;
127 } 129 }
128 130
129 TestSharedMemoryHandleMsg2::Schema::Param p; 131 TestSharedMemoryHandleMsg2::Schema::Param p;
130 if (!TestSharedMemoryHandleMsg2::Read(&message, &p)) { 132 if (!TestSharedMemoryHandleMsg2::Read(&message, &p)) {
131 LOG(ERROR) << "Failed to deserialize message."; 133 LOG(ERROR) << "Failed to deserialize message.";
132 return false; 134 return false;
133 } 135 }
134 136
135 *handle1 = base::get<0>(p); 137 *handle1 = std::get<0>(p);
136 *handle2 = base::get<1>(p); 138 *handle2 = std::get<1>(p);
137 return true; 139 return true;
138 } 140 }
139 141
140 // Returns |nullptr| on error. 142 // Returns |nullptr| on error.
141 scoped_ptr<base::SharedMemory> MapSharedMemoryHandle( 143 scoped_ptr<base::SharedMemory> MapSharedMemoryHandle(
142 const base::SharedMemoryHandle& shm, 144 const base::SharedMemoryHandle& shm,
143 bool read_only) { 145 bool read_only) {
144 if (!shm.IsValid()) { 146 if (!shm.IsValid()) {
145 LOG(ERROR) << "Invalid SharedMemoryHandle"; 147 LOG(ERROR) << "Invalid SharedMemoryHandle";
146 return nullptr; 148 return nullptr;
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 void SendPosixFDAndMachPortCallback(IPC::Sender* sender, 863 void SendPosixFDAndMachPortCallback(IPC::Sender* sender,
862 const IPC::Message& message, 864 const IPC::Message& message,
863 ChildProcessGlobals* globals) { 865 ChildProcessGlobals* globals) {
864 TestSharedMemoryHandleMsg3::Schema::Param p; 866 TestSharedMemoryHandleMsg3::Schema::Param p;
865 if (!TestSharedMemoryHandleMsg3::Read(&message, &p)) { 867 if (!TestSharedMemoryHandleMsg3::Read(&message, &p)) {
866 LOG(ERROR) << "Failed to deserialize message."; 868 LOG(ERROR) << "Failed to deserialize message.";
867 SendControlMessage(sender, false); 869 SendControlMessage(sender, false);
868 return; 870 return;
869 } 871 }
870 872
871 base::SharedMemoryHandle handle1 = base::get<1>(p); 873 base::SharedMemoryHandle handle1 = std::get<1>(p);
872 base::SharedMemoryHandle handle2 = base::get<3>(p); 874 base::SharedMemoryHandle handle2 = std::get<3>(p);
873 bool success1 = CheckContentsOfSharedMemoryHandle(handle1, kDataBuffer1) && 875 bool success1 = CheckContentsOfSharedMemoryHandle(handle1, kDataBuffer1) &&
874 CheckContentsOfSharedMemoryHandle(handle2, kDataBuffer2); 876 CheckContentsOfSharedMemoryHandle(handle2, kDataBuffer2);
875 if (!success1) 877 if (!success1)
876 LOG(ERROR) << "SharedMemoryHandles have wrong contents."; 878 LOG(ERROR) << "SharedMemoryHandles have wrong contents.";
877 879
878 bool success2 = 880 bool success2 =
879 CheckContentsOfFileDescriptor(base::get<0>(p), kDataBuffer3) && 881 CheckContentsOfFileDescriptor(std::get<0>(p), kDataBuffer3) &&
880 CheckContentsOfFileDescriptor(base::get<2>(p), kDataBuffer4); 882 CheckContentsOfFileDescriptor(std::get<2>(p), kDataBuffer4);
881 if (!success2) 883 if (!success2)
882 LOG(ERROR) << "FileDescriptors have wrong contents."; 884 LOG(ERROR) << "FileDescriptors have wrong contents.";
883 885
884 SendControlMessage(sender, success1 && success2); 886 SendControlMessage(sender, success1 && success2);
885 } 887 }
886 888
887 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendPosixFDAndMachPort) { 889 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendPosixFDAndMachPort) {
888 return CommonPrivilegedProcessMain(&SendPosixFDAndMachPortCallback, 890 return CommonPrivilegedProcessMain(&SendPosixFDAndMachPortCallback,
889 "SendPosixFDAndMachPort"); 891 "SendPosixFDAndMachPort");
890 } 892 }
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 SendControlMessage(sender, success); 1328 SendControlMessage(sender, success);
1327 } 1329 }
1328 } 1330 }
1329 1331
1330 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(MemoryUsageManyMessages) { 1332 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(MemoryUsageManyMessages) {
1331 return CommonPrivilegedProcessMain(&MemoryUsageManyMessagesCallback, 1333 return CommonPrivilegedProcessMain(&MemoryUsageManyMessagesCallback,
1332 "MemoryUsageManyMessages"); 1334 "MemoryUsageManyMessages");
1333 } 1335 }
1334 1336
1335 } // namespace 1337 } // namespace
OLDNEW
« no previous file with comments | « no previous file | ipc/attachment_broker_privileged_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698