SpeechRecognitionDispatcher: break out translation of error codes to separate function

content/renderer/speech_recognition_dispatcher.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 "content/renderer/speech_recognition_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "content/common/speech_recognition_messages.h"
 #include "content/renderer/render_view_impl.h"
@@ skipping 103 matching lines @@
 }
 
 void SpeechRecognitionDispatcher::OnSoundEnded(int request_id) {
   recognizer_client_->didEndSound(GetHandleFromID(request_id));
 }
 
 void SpeechRecognitionDispatcher::OnAudioEnded(int request_id) {
   recognizer_client_->didEndAudio(GetHandleFromID(request_id));
 }
 
+static WebSpeechRecognizerClient::ErrorCode WebKitErrorCode(
+    content::SpeechRecognitionErrorCode e) {
+  switch (e) {
+    case content::SPEECH_RECOGNITION_ERROR_NONE:
+      NOTREACHED();
+      return WebSpeechRecognizerClient::OtherError;
+    case content::SPEECH_RECOGNITION_ERROR_ABORTED:
+      return WebSpeechRecognizerClient::AbortedError;
+    case content::SPEECH_RECOGNITION_ERROR_AUDIO:
+      return WebSpeechRecognizerClient::AudioCaptureError;
+    case content::SPEECH_RECOGNITION_ERROR_NETWORK:
+      return WebSpeechRecognizerClient::NetworkError;
+    case content::SPEECH_RECOGNITION_ERROR_NO_SPEECH:
+      return WebSpeechRecognizerClient::NoSpeechError;
+    case content::SPEECH_RECOGNITION_ERROR_NO_MATCH:
+      NOTREACHED();
+      return WebSpeechRecognizerClient::OtherError;
+    case content::SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR:
+      return WebSpeechRecognizerClient::BadGrammarError;
+  }
+  NOTREACHED();
+  return WebSpeechRecognizerClient::OtherError;
+}
+
 void SpeechRecognitionDispatcher::OnErrorOccurred(
     int request_id, const SpeechRecognitionError& error) {
   if (error.code == content::SPEECH_RECOGNITION_ERROR_NO_MATCH) {
     recognizer_client_->didReceiveNoMatch(GetHandleFromID(request_id),
                                           WebSpeechRecognitionResult());
   } else {
-    // TODO(primiano): speech_recognition_error.h must be updated to match the
-    // new enums defined in the the API specs (thus removing the code below).
-    WebSpeechRecognizerClient::ErrorCode wk_error_code;
-    switch (error.code) {
-      case content::SPEECH_RECOGNITION_ERROR_ABORTED:
-        wk_error_code = WebSpeechRecognizerClient::AbortedError;
-        break;
-      case content::SPEECH_RECOGNITION_ERROR_AUDIO:
-        wk_error_code = WebSpeechRecognizerClient::AudioCaptureError;
-        break;
-      case content::SPEECH_RECOGNITION_ERROR_NETWORK:
-        wk_error_code = WebSpeechRecognizerClient::NetworkError;
-        break;
-      case content::SPEECH_RECOGNITION_ERROR_NO_SPEECH:
-        wk_error_code = WebSpeechRecognizerClient::NoSpeechError;
-        break;
-      case content::SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR:
-        wk_error_code = WebSpeechRecognizerClient::BadGrammarError;
-        break;
-      default:
-        NOTREACHED();
-        wk_error_code = WebSpeechRecognizerClient::OtherError;
-    }
     recognizer_client_->didReceiveError(GetHandleFromID(request_id),
                                         WebString(), // TODO(primiano): message?
-                                        wk_error_code);
+                                        WebKitErrorCode(error.code));
   }
 }
 
 void SpeechRecognitionDispatcher::OnRecognitionEnded(int request_id) {
   recognizer_client_->didEnd(GetHandleFromID(request_id));
   handle_map_.erase(request_id);
 }
 
 void SpeechRecognitionDispatcher::OnResultRetrieved(
     int request_id, const SpeechRecognitionResult& result) {
@@ skipping 41 matching lines @@
   }
   return false;
 }
 
 const WebSpeechRecognitionHandle& SpeechRecognitionDispatcher::GetHandleFromID(
     int request_id) {
   HandleMap::iterator iter = handle_map_.find(request_id);
   DCHECK(iter != handle_map_.end());
   return iter->second;
 }