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 WebSpeechRecognitionHandle::OtherError;
+    case content::SPEECH_RECOGNITION_ERROR_ABORTED:
+      return WebSpeechRecognitionHandle::AbortedError;
+    case content::SPEECH_RECOGNITION_ERROR_AUDIO:
+      return WebSpeechRecognitionHandle::AudioCaptureError;
+    case content::SPEECH_RECOGNITION_ERROR_NETWORK:
+      return WebSpeechRecognitionHandle::NetworkError;
+    case content::SPEECH_RECOGNITION_ERROR_NO_SPEECH:
+      return WebSpeechRecognitionHandle::NoSpeechError;
+    case content::SPEECH_RECOGNITION_ERROR_NO_MATCH:

[Satish, 2012/08/01 13:30:33]

looks like this canbeb removed (as it is handledi n line 149) and line 127's
case can be replaced with a DCHECK in line 149. The rest would be a simple
mapping so perhaps an array/table would be sufficient?

[hans, 2012/08/01 14:46:21]

The reason I kept the impossible cases (ERROR_NONE and ERROR_NO_MATCH) is to
make the switch fully cover the enum, so that if more values are added to the
enum at some point, we'll get compiler warnings about the switch not covering
them.

I don't like building look-up tables manually; the compiler should do it for us.

+      NOTREACHED();
+      return WebSpeechRecognitionHandle::OtherError;
+    case content::SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR:
+      return WebSpeechRecognitionHandle::BadGrammarError;
+  }
+  NOTREACHED();
+}
+
 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

[Satish, 2012/08/01 13:30:33]

is this not the intention anymore?

[hans, 2012/08/01 14:46:21]

No, I think it's better that the enum in speech_recognition_error.h has the
codes that make sense for Chromium, and that we then translate to the webkit
codes like we do here.

For example, the Chromium enum has error codes for "no error" and "no match"
which are used internally, but will never be matched by error codes on the
webkit side.

-    // 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;
 }