Index: remoting/host/desktop_session_proxy.cc |
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc |
index 6166d20aa5af2a0103411ab7ba2d89a85fa8a036..0e255df47545ba7f376b60ef773d4da7e7ea5c2e 100644 |
--- a/remoting/host/desktop_session_proxy.cc |
+++ b/remoting/host/desktop_session_proxy.cc |
@@ -54,12 +54,6 @@ class DesktopSessionProxy::IpcSharedBufferCore |
size_(size) { |
if (!shared_memory_.Map(size)) { |
LOG(ERROR) << "Failed to map a shared buffer: id=" << id |
-#if defined(OS_WIN) |
- << ", handle=" << handle.GetHandle() |
-#else |
- << ", handle.fd=" |
- << base::SharedMemory::GetFdFromSharedMemoryHandle(handle) |
-#endif |
<< ", size=" << size; |
} |
} |
@@ -470,18 +464,12 @@ void DesktopSessionProxy::OnAudioPacket(const std::string& serialized_packet) { |
void DesktopSessionProxy::OnCreateSharedBuffer( |
int id, |
- IPC::PlatformFileForTransit handle, |
+ base::SharedMemoryHandle handle, |
uint32 size) { |
DCHECK(caller_task_runner_->BelongsToCurrentThread()); |
-#if defined(OS_WIN) |
- base::SharedMemoryHandle shm_handle = |
- base::SharedMemoryHandle(handle, base::GetCurrentProcId()); |
-#else |
- base::SharedMemoryHandle shm_handle = base::SharedMemoryHandle(handle); |
-#endif |
scoped_refptr<IpcSharedBufferCore> shared_buffer = |
- new IpcSharedBufferCore(id, shm_handle, desktop_process_.Handle(), size); |
+ new IpcSharedBufferCore(id, handle, desktop_process_.Handle(), size); |
if (shared_buffer->memory() != nullptr && |
!shared_buffers_.insert(std::make_pair(id, shared_buffer)).second) { |