Revert of Revert of Use the new java_cpp_enum rule in content.

content/public/common/speech_recognition_error.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_SPEECH_RECOGNITION_ERROR_H_
 #define CONTENT_PUBLIC_COMMON_SPEECH_RECOGNITION_ERROR_H_
 
 namespace content {
 
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.content_public.common
+// GENERATED_JAVA_PREFIX_TO_STRIP: SPEECH_RECOGNITION_ERROR_
 enum SpeechRecognitionErrorCode {
-#define DEFINE_SPEECH_RECOGNITION_ERROR(x, y) SPEECH_RECOGNITION_ERROR_##x = y,
-#include "content/public/common/speech_recognition_error_list.h"
-#undef DEFINE_SPEECH_RECOGNITION_ERROR
+  // There was no error.
+  SPEECH_RECOGNITION_ERROR_NONE,
+
+  // The user or a script aborted speech input.
+  SPEECH_RECOGNITION_ERROR_ABORTED,
+
+  // There was an error with recording audio.
+  SPEECH_RECOGNITION_ERROR_AUDIO,
+
+  // There was a network error.
+  SPEECH_RECOGNITION_ERROR_NETWORK,
+
+  // Not allowed for privacy or security reasons.
+  SPEECH_RECOGNITION_ERROR_NOT_ALLOWED,
+
+  // No speech heard before timeout.
+  SPEECH_RECOGNITION_ERROR_NO_SPEECH,
+
+  // Speech was heard, but could not be interpreted.
+  SPEECH_RECOGNITION_ERROR_NO_MATCH,
+
+  // There was an error in the speech recognition grammar.
+  SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR,
+  SPEECH_RECOGNITION_ERROR_LAST = SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR,
 };
 
 // Error details for the SPEECH_RECOGNITION_ERROR_AUDIO error.
 enum SpeechAudioErrorDetails {
   SPEECH_AUDIO_ERROR_DETAILS_NONE = 0,
   SPEECH_AUDIO_ERROR_DETAILS_NO_MIC,
   SPEECH_AUDIO_ERROR_DETAILS_LAST = SPEECH_AUDIO_ERROR_DETAILS_NO_MIC
 };
 
 struct CONTENT_EXPORT SpeechRecognitionError {
@@ skipping 11 matching lines @@
   SpeechRecognitionError(SpeechRecognitionErrorCode code_value,
                          SpeechAudioErrorDetails details_value)
       : code(code_value),
         details(details_value) {
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_SPEECH_RECOGNITION_ERROR_H_