Add connection error handler for SpeechRecognitionSessionClient

Bug: 865571
Change-Id: I722a58f53bbeee0236e6fb64b8f7eb9956526c3c
Reviewed-on: https://chromium-review.googlesource.com/1147485Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Adithya Srinivasan <adithyas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577520}

content/browser/speech/speech_recognition_dispatcher_host.cc

@@ -201,7 +201,11 @@ SpeechRecognitionSession::SpeechRecognitionSession(
     : session_id_(SpeechRecognitionManager::kSessionIDInvalid),
       client_(std::move(client_ptr_info)),
       stopped_(false),
-      weak_factory_(this) {}
+      weak_factory_(this) {
+  client_.set_connection_error_handler(
+      base::BindOnce(&SpeechRecognitionSession::ConnectionErrorHandler,
+                     base::Unretained(this)));
+}
 
 SpeechRecognitionSession::~SpeechRecognitionSession() {
   // If a connection error happens and the session hasn't been stopped yet,
@@ -273,4 +277,9 @@ void SpeechRecognitionSession::OnAudioLevelsChange(int session_id,
 void SpeechRecognitionSession::OnEnvironmentEstimationComplete(int session_id) {
 }
 
+void SpeechRecognitionSession::ConnectionErrorHandler() {
+  if (!stopped_)
+    Abort();
+}
+
 }  // namespace content

content/browser/speech/speech_recognition_dispatcher_host.h

@@ -109,6 +109,8 @@ class SpeechRecognitionSession : public blink::mojom::SpeechRecognitionSession,
                            float noise_volume) override;
 
  private:
+  void ConnectionErrorHandler();
+
   int session_id_;
   blink::mojom::SpeechRecognitionSessionClientPtr client_;
   bool stopped_;