Fix double close in MojoAudioOutputStream.

media/mojo/services/mojo_audio_output_stream.cc

 // Copyright 2017 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 "media/mojo/services/mojo_audio_output_stream.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/callback_helpers.h"
@@ skipping 53 matching lines @@
   DCHECK(shared_memory);
   DCHECK(foreign_socket);
 
   base::SharedMemoryHandle foreign_memory_handle =
       base::SharedMemory::DuplicateHandle(shared_memory->handle());
   DCHECK(base::SharedMemory::IsHandleValid(foreign_memory_handle));
 
   mojo::ScopedSharedBufferHandle buffer_handle = mojo::WrapSharedMemoryHandle(
       foreign_memory_handle, shared_memory->requested_size(), false);
   mojo::ScopedHandle socket_handle =
-      mojo::WrapPlatformFile(foreign_socket->handle());
+      mojo::WrapPlatformFile(foreign_socket->Release());

[Nico, 2017/04/10 15:29:35]

Should WrapPltformFile take an rvalue of some kind to make this kind of mistake
impossible through static typing?

[Max Morin, 2017/04/10 15:44:20]

It should probably take a ScopedPlatformHandle (and manually closed handles
shouldn't be used ever). I think this would be a lot of work to change though.

[Nico, 2017/04/10 15:50:37]

Maybe at least file a bug.

[Max Morin, 2017/04/11 09:11:11]

I filed crbug.com/710376 and also added checks for double-closing to the unit
tests.

 
   DCHECK(buffer_handle.is_valid());
   DCHECK(socket_handle.is_valid());
 
   base::ResetAndReturn(&stream_created_callback_)
       .Run(std::move(buffer_handle), std::move(socket_handle));
 }
 
 void MojoAudioOutputStream::OnStreamError(int stream_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   OnError();
 }
 
 void MojoAudioOutputStream::OnError() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(deleter_callback_);
   std::move(deleter_callback_).Run();  // Deletes |this|.
 }
 
 }  // namespace media