Fix logging of StreamBrokerDisconnectReason

The case where the connection is broken by the renderer is logged
incorrectly.

Bug: 851865
Change-Id: I72a69c5b9fa84a6f8c569b29fbcb0528c16c0524
Reviewed-on: https://chromium-review.googlesource.com/1096770
Commit-Queue: Max Morin <maxmorin@chromium.org>
Reviewed-by: Olga Sharonova <olka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566777}

content/browser/media/audio_input_stream_broker.cc

@@ -52,8 +52,8 @@ AudioInputStreamBroker::AudioInputStreamBroker(
   TRACE_EVENT_NESTABLE_ASYNC_BEGIN0("audio", "AudioInputStreamBroker", this);
 
   // Unretained is safe because |this| owns |renderer_factory_client_|.
-  renderer_factory_client_.set_connection_error_handler(
-      base::BindOnce(&AudioInputStreamBroker::Cleanup, base::Unretained(this)));
+  renderer_factory_client_.set_connection_error_handler(base::BindOnce(
+      &AudioInputStreamBroker::ClientBindingLost, base::Unretained(this)));
 
   // Notify RenderProcessHost about input stream so the renderer is not
   // background.
@@ -210,6 +210,12 @@ void AudioInputStreamBroker::ObserverBindingLost(
   Cleanup();
 }
 
+void AudioInputStreamBroker::ClientBindingLost() {
+  disconnect_reason_ = media::mojom::AudioInputStreamObserver::
+      DisconnectReason::kTerminatedByClient;
+  Cleanup();
+}
+
 void AudioInputStreamBroker::Cleanup() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 

content/browser/media/audio_input_stream_broker.h

@@ -54,7 +54,7 @@ class CONTENT_EXPORT AudioInputStreamBroker final
                      const base::Optional<base::UnguessableToken>& stream_id);
 
   void ObserverBindingLost(uint32_t reason, const std::string& description);
-
+  void ClientBindingLost();
   void Cleanup();
 
   const std::string device_id_;

content/browser/media/audio_output_stream_broker.cc

@@ -48,7 +48,7 @@ AudioOutputStreamBroker::AudioOutputStreamBroker(
 
   // Unretained is safe because |this| owns |client_|
   client_.set_connection_error_handler(base::BindOnce(
-      &AudioOutputStreamBroker::Cleanup, base::Unretained(this)));
+      &AudioOutputStreamBroker::ClientBindingLost, base::Unretained(this)));
 }
 
 AudioOutputStreamBroker::~AudioOutputStreamBroker() {
@@ -149,6 +149,12 @@ void AudioOutputStreamBroker::ObserverBindingLost(
   Cleanup();
 }
 
+void AudioOutputStreamBroker::ClientBindingLost() {
+  disconnect_reason_ = media::mojom::AudioOutputStreamObserver::
+      DisconnectReason::kTerminatedByClient;
+  Cleanup();
+}
+
 void AudioOutputStreamBroker::Cleanup() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(owning_sequence_);
   std::move(deleter_).Run(this);

content/browser/media/audio_output_stream_broker.h

@@ -46,6 +46,7 @@ class CONTENT_EXPORT AudioOutputStreamBroker final : public AudioStreamBroker {
   void StreamCreated(media::mojom::AudioOutputStreamPtr stream,
                      media::mojom::ReadWriteAudioDataPipePtr data_pipe);
   void ObserverBindingLost(uint32_t reason, const std::string& description);
+  void ClientBindingLost();
   void Cleanup();
 
   SEQUENCE_CHECKER(owning_sequence_);