Remove dependency on webrtc::SharedMemory::handle()

remoting/host/desktop_session_agent.cc

 // Copyright (c) 2012 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 "remoting/host/desktop_session_agent.h"
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "ipc/ipc_channel_proxy.h"
@@ skipping 71 matching lines @@
       return nullptr;
 #else
     if (!memory->CreateAndMapAnonymous(size))
       return nullptr;
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
     return make_scoped_ptr(new SharedBuffer(agent, memory.Pass(), size, id));
   }
 
   ~SharedBuffer() override { agent_->OnSharedBufferDeleted(id()); }
 
+  base::SharedMemory* shared_memory() { return shared_memory_.get(); }
+
  private:
   SharedBuffer(DesktopSessionAgent* agent,
                scoped_ptr<base::SharedMemory> memory,
                size_t size,
                int id)
-      : SharedMemory(memory->memory(),
-                     size,
-#if defined(OS_WIN)
-                     memory->handle().GetHandle(),
-#else
-                     base::SharedMemory::GetFdFromSharedMemoryHandle(
-                         memory->handle()),
-#endif
-                     id),
+      : SharedMemory(memory->memory(), size, 0, id),
         agent_(agent),
-        shared_memory_(memory.Pass()) {
-  }
+        shared_memory_(memory.Pass()) {}
 
   DesktopSessionAgent* agent_;
   scoped_ptr<base::SharedMemory> shared_memory_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedBuffer);
 };
 
 DesktopSessionAgent::Delegate::~Delegate() {
 }
 
@@ skipping 82 matching lines @@
     // ID.
     //
     // It is very unlikely (though theoretically possible) to allocate the same
     // ID for two different buffers due to integer overflow. It should take
     // about a year of allocating 100 new buffers every second. Practically
     // speaking it never happens.
     next_shared_buffer_id_ += 2;
 
     IPC::PlatformFileForTransit handle;
 #if defined(OS_WIN)
-    handle = buffer->handle();
+    handle = buffer->shared_memory()->handle().GetHandle(),
 #else
-    handle = base::FileDescriptor(buffer->handle(), false);
+    handle =
+        base::FileDescriptor(base::SharedMemory::GetFdFromSharedMemoryHandle(
+            buffer->shared_memory()->handle()), false);
 #endif
     SendToNetwork(new ChromotingDesktopNetworkMsg_CreateSharedBuffer(
         buffer->id(), handle, buffer->size()));
   }
 
   return buffer.release();
 }
 
 DesktopSessionAgent::~DesktopSessionAgent() {
   DCHECK(!audio_capturer_);
@@ skipping 381 matching lines @@
 void DesktopSessionAgent::OnSharedBufferDeleted(int id) {
   DCHECK(video_capture_task_runner_->BelongsToCurrentThread());
   DCHECK(id != 0);
 
   shared_buffers_--;
   DCHECK_GE(shared_buffers_, 0);
   SendToNetwork(new ChromotingDesktopNetworkMsg_ReleaseSharedBuffer(id));
 }
 
 }  // namespace remoting