Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: media/mojo/services/mojo_audio_output_stream.cc

Issue 2809673002: Fix double close in MojoAudioOutputStream. (Closed)
Patch Set: Fix Win complie. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/mojo/services/mojo_audio_output_stream.cc
diff --git a/media/mojo/services/mojo_audio_output_stream.cc b/media/mojo/services/mojo_audio_output_stream.cc
index 1be3171295cd7ef8c92b82afaf84dbbd656be57d..cd656b82574be3234bac50f0b3c9e346fb5c26bb 100644
--- a/media/mojo/services/mojo_audio_output_stream.cc
+++ b/media/mojo/services/mojo_audio_output_stream.cc
@@ -58,7 +58,7 @@ void MojoAudioOutputStream::SetVolume(double volume) {
void MojoAudioOutputStream::OnStreamCreated(
int stream_id,
base::SharedMemory* shared_memory,
- base::CancelableSyncSocket* foreign_socket) {
+ std::unique_ptr<base::CancelableSyncSocket> foreign_socket) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(stream_created_callback_);
DCHECK(shared_memory);
@@ -71,7 +71,7 @@ void MojoAudioOutputStream::OnStreamCreated(
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());
DCHECK(buffer_handle.is_valid());
DCHECK(socket_handle.is_valid());

Powered by Google App Engine
This is Rietveld 408576698