4 files changed, 4 insertions, 12 deletions
diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc
index c1f9c67..a4ea958 100644
--- a/chrome/nacl/nacl_thread.cc
+++ b/chrome/nacl/nacl_thread.cc
@@ -84,7 +84,7 @@ void NaClThread::OnControlMessageReceived(const IPC::Message& msg) {
 void NaClThread::OnStartSelLdr(std::vector<nacl::FileDescriptor> handles) {
 #if defined(OS_LINUX)
   nacl::SetCreateMemoryObjectFunc(
-      renderer_sandbox_support::MakeSharedMemorySegmentViaIPCExecutable);
+      renderer_sandbox_support::MakeSharedMemorySegmentViaIPC);
 #elif defined(OS_MACOSX)
   nacl::SetCreateMemoryObjectFunc(CreateMemoryObject);
   CHECK(handles.size() >= 1);
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 261ba57..a28f823 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -175,7 +175,7 @@ RenderProcessImpl::RenderProcessImpl()
     RegisterInternalNaClPlugin(funcs);
 #if defined(OS_LINUX)
     nacl::SetCreateMemoryObjectFunc(
-        renderer_sandbox_support::MakeSharedMemorySegmentViaIPCExecutable);
+        renderer_sandbox_support::MakeSharedMemorySegmentViaIPC);
 #endif
   }
 #endif
diff --git a/chrome/renderer/renderer_sandbox_support_linux.cc b/chrome/renderer/renderer_sandbox_support_linux.cc
index 283afe6..29fae48 100644
--- a/chrome/renderer/renderer_sandbox_support_linux.cc
+++ b/chrome/renderer/renderer_sandbox_support_linux.cc
@@ -78,7 +78,7 @@ void getRenderStyleForStrike(const char* family, int sizeAndStyle,
   }
 }
 
-int MakeSharedMemorySegmentViaIPC(size_t length) {
+int MakeSharedMemorySegmentViaIPC(size_t length, bool executable) {
   Pickle request;
   request.WriteInt(LinuxSandbox::METHOD_MAKE_SHARED_MEMORY_SEGMENT);
   request.WriteUInt32(length);
@@ -92,10 +92,6 @@ int MakeSharedMemorySegmentViaIPC(size_t length) {
   return result_fd;
 }
 
-int MakeSharedMemorySegmentViaIPCExecutable(size_t length, bool executable) {
-  return MakeSharedMemorySegmentViaIPC(length);
-}
-
 int MatchFontWithFallback(const std::string& face, bool bold,
                           bool italic, int charset) {
   Pickle request;
diff --git a/chrome/renderer/renderer_sandbox_support_linux.h b/chrome/renderer/renderer_sandbox_support_linux.h
index 1b71f38..6059414 100644
--- a/chrome/renderer/renderer_sandbox_support_linux.h
+++ b/chrome/renderer/renderer_sandbox_support_linux.h
@@ -29,13 +29,9 @@ void getRenderStyleForStrike(const char* family, int sizeAndStyle,
                              WebKit::WebFontRenderStyle* out);
 
 // Returns a file descriptor for a shared memory segment.
-// TODO(mseaborn): Remove this when the call site is gone from native_client.
-int MakeSharedMemorySegmentViaIPC(size_t length);
-
-// Returns a file descriptor for a shared memory segment.
 // The second argument is ignored because SHM segments are always
 // mappable with PROT_EXEC on Linux.
-int MakeSharedMemorySegmentViaIPCExecutable(size_t length, bool executable);
+int MakeSharedMemorySegmentViaIPC(size_t length, bool executable);
 
 // Return a read-only file descriptor to the font which best matches the given
 // properties or -1 on failure.