Index: base/memory/shared_memory_unittest.cc |
diff --git a/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc |
index f29865c21aee054cc1368968263d8b317d53ea10..19dedccb4768ad01040aa73a90d722e32fe18f8e 100644 |
--- a/base/memory/shared_memory_unittest.cc |
+++ b/base/memory/shared_memory_unittest.cc |
@@ -316,8 +316,6 @@ TEST(SharedMemoryTest, AnonymousPrivate) { |
} |
} |
-// The Mach functionality is tested in shared_memory_mac_unittest.cc. |
-#if !(defined(OS_MACOSX) && !defined(OS_IOS)) |
TEST(SharedMemoryTest, ShareReadOnly) { |
StringPiece contents = "Hello World"; |
@@ -325,6 +323,10 @@ TEST(SharedMemoryTest, ShareReadOnly) { |
SharedMemoryCreateOptions options; |
options.size = contents.size(); |
options.share_read_only = true; |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+ // The Mach functionality is tested in shared_memory_mac_unittest.cc. |
+ options.type = SharedMemoryHandle::POSIX; |
+#endif |
ASSERT_TRUE(writable_shmem.Create(options)); |
ASSERT_TRUE(writable_shmem.Map(options.size)); |
memcpy(writable_shmem.memory(), contents.data(), contents.size()); |
@@ -400,7 +402,6 @@ TEST(SharedMemoryTest, ShareReadOnly) { |
#error Unexpected platform; write a test that tries to make 'handle' writable. |
#endif // defined(OS_POSIX) || defined(OS_WIN) |
} |
-#endif // !(defined(OS_MACOSX) && !defined(OS_IOS)) |
TEST(SharedMemoryTest, ShareToSelf) { |
StringPiece contents = "Hello World"; |
@@ -474,7 +475,7 @@ TEST(SharedMemoryTest, MapTwice) { |
EXPECT_EQ(old_address, memory.memory()); |
} |
-#if defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) |
+#if defined(OS_POSIX) |
// This test is not applicable for iOS (crbug.com/399384). |
#if !defined(OS_IOS) |
// Create a shared memory object, mmap it, and mprotect it to PROT_EXEC. |
@@ -485,6 +486,10 @@ TEST(SharedMemoryTest, AnonymousExecutable) { |
SharedMemoryCreateOptions options; |
options.size = kTestSize; |
options.executable = true; |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+ // The Mach functionality is tested in shared_memory_mac_unittest.cc. |
+ options.type = SharedMemoryHandle::POSIX; |
+#endif |
EXPECT_TRUE(shared_memory.Create(options)); |
EXPECT_TRUE(shared_memory.Map(shared_memory.requested_size())); |
@@ -518,6 +523,10 @@ TEST(SharedMemoryTest, FilePermissionsAnonymous) { |
SharedMemory shared_memory; |
SharedMemoryCreateOptions options; |
options.size = kTestSize; |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+ // The Mach functionality is tested in shared_memory_mac_unittest.cc. |
+ options.type = SharedMemoryHandle::POSIX; |
+#endif |
// Set a file mode creation mask that gives all permissions. |
ScopedUmaskSetter permissive_mask(S_IWGRP | S_IWOTH); |
@@ -540,6 +549,10 @@ TEST(SharedMemoryTest, FilePermissionsNamed) { |
SharedMemory shared_memory; |
SharedMemoryCreateOptions options; |
options.size = kTestSize; |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+ // The Mach functionality is tested in shared_memory_mac_unittest.cc. |
+ options.type = SharedMemoryHandle::POSIX; |
+#endif |
// Set a file mode creation mask that gives all permissions. |
ScopedUmaskSetter permissive_mask(S_IWGRP | S_IWOTH); |
@@ -556,7 +569,7 @@ TEST(SharedMemoryTest, FilePermissionsNamed) { |
} |
#endif // !defined(OS_ANDROID) |
-#endif // defined(OS_POSIX) && !(defined(OS_MACOSX) && !defined(OS_IOS)) |
+#endif // defined(OS_POSIX) |
// Map() will return addresses which are aligned to the platform page size, this |
// varies from platform to platform though. Since we'd like to advertise a |