Revert of mac: Add auto-close and share-read-only functionality to SharedMemory.

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"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/mac/mac_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "ipc/attachment_broker_privileged_mac.h"
 #include "ipc/attachment_broker_unprivileged_mac.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_test_base.h"
 #include "ipc/ipc_test_messages.h"
 #include "ipc/test_util_mac.h"
 
@@ skipping 80 matching lines @@
     return false;
   }
 
   *handle1 = base::get<0>(p);
   *handle2 = base::get<1>(p);
   return true;
 }
 
 // Returns |nullptr| on error.
 scoped_ptr<base::SharedMemory> MapSharedMemoryHandle(
-    const base::SharedMemoryHandle& shm,
-    bool read_only) {
+    const base::SharedMemoryHandle& shm) {
   if (!shm.IsValid()) {
     LOG(ERROR) << "Invalid SharedMemoryHandle";
     return nullptr;
   }
 
   size_t size;
   if (!shm.GetSize(&size)) {
     LOG(ERROR) << "Couldn't get size of SharedMemoryHandle";
     return nullptr;
   }
 
   scoped_ptr<base::SharedMemory> shared_memory(
-      new base::SharedMemory(shm, read_only));
+      new base::SharedMemory(shm, false));
   shared_memory->Map(size);
   return shared_memory;
 }
 
 // This method maps the SharedMemoryHandle, checks the contents, and then
 // consumes a reference to the underlying Mach port.
 bool CheckContentsOfSharedMemoryHandle(const base::SharedMemoryHandle& shm,
                                        const std::string& contents) {
-  scoped_ptr<base::SharedMemory> shared_memory(
-      MapSharedMemoryHandle(shm, false));
+  scoped_ptr<base::SharedMemory> shared_memory(MapSharedMemoryHandle(shm));
 
   if (memcmp(shared_memory->memory(), contents.c_str(), contents.size()) != 0) {
     LOG(ERROR) << "Shared Memory contents not equivalent";
     return false;
   }
   return true;
 }
 
 // This method mmaps the FileDescriptor, checks the contents, and then munmaps
 // the FileDescriptor and closes the underlying fd.
@@ skipping 34 matching lines @@
   return base::FileDescriptor(fd_closer.release(), true);
 }
 
 // Maps both handles, then checks that their contents matches |contents|. Then
 // checks that changes to one are reflected in the other. Then consumes
 // references to both underlying Mach ports.
 bool CheckContentsOfTwoEquivalentSharedMemoryHandles(
     const base::SharedMemoryHandle& handle1,
     const base::SharedMemoryHandle& handle2,
     const std::string& contents) {
-  scoped_ptr<base::SharedMemory> shared_memory1(
-      MapSharedMemoryHandle(handle1, false));
-  scoped_ptr<base::SharedMemory> shared_memory2(
-      MapSharedMemoryHandle(handle2, false));
+  scoped_ptr<base::SharedMemory> shared_memory1(MapSharedMemoryHandle(handle1));
+  scoped_ptr<base::SharedMemory> shared_memory2(MapSharedMemoryHandle(handle2));
 
   if (memcmp(shared_memory1->memory(), contents.c_str(), contents.size()) !=
       0) {
     LOG(ERROR) << "Incorrect contents in shared_memory1";
     return false;
   }
 
   if (memcmp(shared_memory1->memory(), shared_memory2->memory(),
              contents.size()) != 0) {
     LOG(ERROR) << "Incorrect contents in shared_memory2";
@@ skipping 328 matching lines @@
     LOG(INFO) << "Memory leak!.";
   }
   LOG(INFO) << "Privileged process end.";
   return 0;
 }
 
 // An unprivileged process makes a shared memory region, and writes a string to
 // it. The SharedMemoryHandle is sent to the privileged process using Chrome
 // IPC. The privileged process checks that it received the same memory region.
 TEST_F(IPCAttachmentBrokerMacTest, SendSharedMemoryHandle) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   CommonSetUp("SendSharedMemoryHandle");
 
   SendMessage1(kDataBuffer1);
   base::MessageLoop::current()->Run();
   CommonTearDown();
 }
 
 void SendSharedMemoryHandleCallback(IPC::Sender* sender,
                                     const IPC::Message& message) {
   bool success = CheckContentsOfMessage1(message, kDataBuffer1);
   SendControlMessage(sender, success);
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendSharedMemoryHandle) {
   return CommonPrivilegedProcessMain(&SendSharedMemoryHandleCallback,
                                      "SendSharedMemoryHandle");
 }
 
 // Similar to SendSharedMemoryHandle, but sends a very long shared memory
 // region.
 TEST_F(IPCAttachmentBrokerMacTest, SendSharedMemoryHandleLong) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   CommonSetUp("SendSharedMemoryHandleLong");
 
   std::string buffer(1 << 23, 'a');
   SendMessage1(buffer);
   base::MessageLoop::current()->Run();
   CommonTearDown();
 }
 
 void SendSharedMemoryHandleLongCallback(IPC::Sender* sender,
                                         const IPC::Message& message) {
   std::string buffer(1 << 23, 'a');
   bool success = CheckContentsOfMessage1(message, buffer);
   SendControlMessage(sender, success);
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendSharedMemoryHandleLong) {
   return CommonPrivilegedProcessMain(&SendSharedMemoryHandleLongCallback,
                                      "SendSharedMemoryHandleLong");
 }
 
 // Similar to SendSharedMemoryHandle, but sends two different shared memory
 // regions in two messages.
 TEST_F(IPCAttachmentBrokerMacTest, SendTwoMessagesDifferentSharedMemoryHandle) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   CommonSetUp("SendTwoMessagesDifferentSharedMemoryHandle");
 
   SendMessage1(kDataBuffer1);
   SendMessage1(kDataBuffer2);
   base::MessageLoop::current()->Run();
   CommonTearDown();
 }
 
 void SendTwoMessagesDifferentSharedMemoryHandleCallback(
     IPC::Sender* sender,
@@ skipping 11 matching lines @@
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendTwoMessagesDifferentSharedMemoryHandle) {
   return CommonPrivilegedProcessMain(
       &SendTwoMessagesDifferentSharedMemoryHandleCallback,
       "SendTwoMessagesDifferentSharedMemoryHandle");
 }
 
 // Similar to SendSharedMemoryHandle, but sends the same shared memory region in
 // two messages.
 TEST_F(IPCAttachmentBrokerMacTest, SendTwoMessagesSameSharedMemoryHandle) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   CommonSetUp("SendTwoMessagesSameSharedMemoryHandle");
 
   {
     scoped_ptr<base::SharedMemory> shared_memory(
         MakeSharedMemory(kDataBuffer1));
 
     for (int i = 0; i < 2; ++i) {
       IPC::Message* message =
           new TestSharedMemoryHandleMsg1(100, shared_memory->handle(), 200);
       sender()->Send(message);
@@ skipping 25 matching lines @@
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendTwoMessagesSameSharedMemoryHandle) {
   return CommonPrivilegedProcessMain(
       &SendTwoMessagesSameSharedMemoryHandleCallback,
       "SendTwoMessagesSameSharedMemoryHandle");
 }
 
 // Similar to SendSharedMemoryHandle, but sends one message with two different
 // memory regions.
 TEST_F(IPCAttachmentBrokerMacTest,
        SendOneMessageWithTwoDifferentSharedMemoryHandles) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   CommonSetUp("SendOneMessageWithTwoDifferentSharedMemoryHandles");
 
   {
     scoped_ptr<base::SharedMemory> shared_memory1(
         MakeSharedMemory(kDataBuffer1));
     scoped_ptr<base::SharedMemory> shared_memory2(
         MakeSharedMemory(kDataBuffer2));
     IPC::Message* message = new TestSharedMemoryHandleMsg2(
         shared_memory1->handle(), shared_memory2->handle());
     sender()->Send(message);
@@ skipping 22 matching lines @@
     SendOneMessageWithTwoDifferentSharedMemoryHandles) {
   return CommonPrivilegedProcessMain(
       &SendOneMessageWithTwoDifferentSharedMemoryHandlesCallback,
       "SendOneMessageWithTwoDifferentSharedMemoryHandles");
 }
 
 // Similar to SendSharedMemoryHandle, but sends one message that contains the
 // same memory region twice.
 TEST_F(IPCAttachmentBrokerMacTest,
        SendOneMessageWithTwoSameSharedMemoryHandles) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   CommonSetUp("SendOneMessageWithTwoSameSharedMemoryHandles");
 
   {
     scoped_ptr<base::SharedMemory> shared_memory(
         MakeSharedMemory(kDataBuffer1));
     IPC::Message* message = new TestSharedMemoryHandleMsg2(
         shared_memory->handle(), shared_memory->handle());
     sender()->Send(message);
   }
   base::MessageLoop::current()->Run();
@@ skipping 18 matching lines @@
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(
     SendOneMessageWithTwoSameSharedMemoryHandles) {
   return CommonPrivilegedProcessMain(
       &SendOneMessageWithTwoSameSharedMemoryHandlesCallback,
       "SendOneMessageWithTwoSameSharedMemoryHandles");
 }
 
 // Sends one message with two Posix FDs and two Mach ports.
 TEST_F(IPCAttachmentBrokerMacTest, SendPosixFDAndMachPort) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath fp1, fp2;
   ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir.path(), &fp1));
   ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir.path(), &fp2));
 
   CommonSetUp("SendPosixFDAndMachPort");
 
   {
     scoped_ptr<base::SharedMemory> shared_memory1(
@@ skipping 43 matching lines @@
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendPosixFDAndMachPort) {
   return CommonPrivilegedProcessMain(&SendPosixFDAndMachPortCallback,
                                      "SendPosixFDAndMachPort");
 }
 
 // Similar to SendHandle, except the attachment's destination process is this
 // process. This is an unrealistic scenario, but simulates an unprivileged
 // process sending an attachment to another unprivileged process.
 TEST_F(IPCAttachmentBrokerMacTest, SendSharedMemoryHandleToSelf) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   SetBroker(new MockBroker);
   CommonSetUp("SendSharedMemoryHandleToSelf");
 
   // Technically, the channel is an endpoint, but we need the proxy listener to
   // receive the messages so that it can quit the message loop.
   channel()->SetAttachmentBrokerEndpoint(false);
   get_proxy_listener()->set_listener(get_broker());
 
   {
     scoped_ptr<base::SharedMemory> shared_memory(
@@ skipping 31 matching lines @@
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendSharedMemoryHandleToSelf) {
   return CommonPrivilegedProcessMain(&SendSharedMemoryHandleToSelfCallback,
                                      "SendSharedMemoryHandleToSelf");
 }
 
 // Similar to SendSharedMemoryHandle, but uses a ChannelProxy instead of a
 // Channel.
 TEST_F(IPCAttachmentBrokerMacTest, SendSharedMemoryHandleChannelProxy) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
   Init("SendSharedMemoryHandleChannelProxy");
   MachPreForkSetUp();
 
   SetBroker(new IPC::AttachmentBrokerUnprivilegedMac);
   get_broker()->AddObserver(get_observer());
 
   scoped_ptr<base::Thread> thread(
       new base::Thread("ChannelProxyTestServerThread"));
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
@@ skipping 28 matching lines @@
   bool success = CheckContentsOfMessage1(message, kDataBuffer1);
   SendControlMessage(sender, success);
 }
 
 MULTIPROCESS_IPC_TEST_CLIENT_MAIN(SendSharedMemoryHandleChannelProxy) {
   return CommonPrivilegedProcessMain(
       &SendSharedMemoryHandleChannelProxyCallback,
       "SendSharedMemoryHandleChannelProxy");
 }
 
-// Similar to SendSharedMemoryHandle, but first makes a copy of the handle using
-// ShareToProcess().
-TEST_F(IPCAttachmentBrokerMacTest, ShareToProcess) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
-  CommonSetUp("ShareToProcess");
-
-  {
-    scoped_ptr<base::SharedMemory> shared_memory(
-        MakeSharedMemory(kDataBuffer1));
-    base::SharedMemoryHandle new_handle;
-    ASSERT_TRUE(shared_memory->ShareToProcess(0, &new_handle));
-    IPC::Message* message =
-        new TestSharedMemoryHandleMsg1(100, new_handle, 200);
-    sender()->Send(message);
-  }
-
-  base::MessageLoop::current()->Run();
-  CommonTearDown();
-}
-
-void ShareToProcessCallback(IPC::Sender* sender, const IPC::Message& message) {
-  bool success = CheckContentsOfMessage1(message, kDataBuffer1);
-  SendControlMessage(sender, success);
-}
-
-MULTIPROCESS_IPC_TEST_CLIENT_MAIN(ShareToProcess) {
-  return CommonPrivilegedProcessMain(&ShareToProcessCallback, "ShareToProcess");
-}
-
-// Similar to ShareToProcess, but instead shares the memory object only with
-// read permissions.
-TEST_F(IPCAttachmentBrokerMacTest, ShareReadOnlyToProcess) {
-  // Mach-based SharedMemory isn't support on OSX 10.6.
-  if (base::mac::IsOSSnowLeopard())
-    return;
-
-  CommonSetUp("ShareReadOnlyToProcess");
-
-  {
-    scoped_ptr<base::SharedMemory> shared_memory(
-        MakeSharedMemory(kDataBuffer1));
-    base::SharedMemoryHandle new_handle;
-    ASSERT_TRUE(shared_memory->ShareReadOnlyToProcess(0, &new_handle));
-    IPC::Message* message =
-        new TestSharedMemoryHandleMsg1(100, new_handle, 200);
-    sender()->Send(message);
-  }
-
-  base::MessageLoop::current()->Run();
-  CommonTearDown();
-}
-
-void ShareReadOnlyToProcessCallback(IPC::Sender* sender,
-                                    const IPC::Message& message) {
-  base::SharedMemoryHandle shm(GetSharedMemoryHandleFromMsg1(message));
-
-  // Try to map the memory as writable.
-  scoped_ptr<base::SharedMemory> shared_memory(
-      MapSharedMemoryHandle(shm, false));
-  ASSERT_EQ(nullptr, shared_memory->memory());
-
-  // Now try as read-only.
-  scoped_ptr<base::SharedMemory> shared_memory2(
-      MapSharedMemoryHandle(shm.Duplicate(), true));
-  int current_prot, max_prot;
-  ASSERT_TRUE(IPC::GetMachProtections(shared_memory2->memory(),
-                                      shared_memory2->mapped_size(),
-                                      &current_prot, &max_prot));
-  ASSERT_EQ(VM_PROT_READ, current_prot);
-  ASSERT_EQ(VM_PROT_READ, max_prot);
-
-  bool success =
-      memcmp(shared_memory2->memory(), kDataBuffer1, strlen(kDataBuffer1)) == 0;
-  SendControlMessage(sender, success);
-}
-
-MULTIPROCESS_IPC_TEST_CLIENT_MAIN(ShareReadOnlyToProcess) {
-  return CommonPrivilegedProcessMain(&ShareReadOnlyToProcessCallback,
-                                     "ShareReadOnlyToProcess");
-}
-
 }  // namespace