Index: base/memory/shared_memory_mac.cc |
diff --git a/base/memory/shared_memory_mac.cc b/base/memory/shared_memory_mac.cc |
index 03c9a6c7e518f729437eb17453ea2682c8cffae8..df0cbd521d844f1dcd0ddea4b69542ebe8b9b11c 100644 |
--- a/base/memory/shared_memory_mac.cc |
+++ b/base/memory/shared_memory_mac.cc |
@@ -53,7 +53,7 @@ SharedMemoryHandle::Type GetABTestMechanism() { |
group = SharedMemoryHandle::POSIX; |
found_group = true; |
} else { |
- group = SharedMemoryHandle::POSIX; |
+ group = SharedMemoryHandle::MACH; |
Mark Mentovai
2015/11/21 14:55:47
NOTREACHED() too?
erikchen
2015/11/23 19:24:14
No - for tests, this is always the block chosen.
|
} |
return group; |
@@ -175,10 +175,20 @@ bool CreateAnonymousSharedMemory(const SharedMemoryCreateOptions& options, |
} // namespace |
SharedMemoryCreateOptions::SharedMemoryCreateOptions() |
- : type(SharedMemoryHandle::POSIX), |
+ : type(SharedMemoryHandle::MACH), |
size(0), |
executable(false), |
- share_read_only(false) {} |
+ share_read_only(false) { |
+ if (mac::IsOSLionOrLater()) { |
+ // A/B test the mechanism. Once the experiment is over, this will always be |
+ // set to SharedMemoryHandle::MACH. |
+ // http://crbug.com/547261 |
+ type = GetABTestMechanism(); |
+ } else { |
+ // Mach shared memory isn't supported on OSX 10.6 or older. |
+ type = SharedMemoryHandle::POSIX; |
+ } |
+} |
SharedMemory::SharedMemory() |
: mapped_memory_mechanism_(SharedMemoryHandle::POSIX), |
@@ -263,22 +273,6 @@ bool SharedMemory::CreateAnonymousPosix(size_t size) { |
return Create(options); |
} |
-bool SharedMemory::CreateAndMapAnonymousMach(size_t size) { |
- SharedMemoryCreateOptions options; |
- |
- if (mac::IsOSLionOrLater()) { |
- // A/B test the mechanism. Once the experiment is over, this will always be |
- // set to SharedMemoryHandle::MACH. |
- // http://crbug.com/547261 |
- options.type = GetABTestMechanism(); |
- } else { |
- // Mach shared memory isn't supported on OSX 10.6 or older. |
- options.type = SharedMemoryHandle::POSIX; |
- } |
- options.size = size; |
- return Create(options) && Map(size); |
-} |
- |
// static |
bool SharedMemory::GetSizeFromSharedMemoryHandle( |
const SharedMemoryHandle& handle, |