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

content/public/common/speech_recognition_error.h

Index: content/public/common/speech_recognition_error.h
diff --git a/content/public/common/speech_recognition_error.h b/content/public/common/speech_recognition_error.h
index a12bc401cabea1aae8e1888ae0041c6ee95b7566..bbd73c7494c23c4edc5aeeadaab74b1338ebd94e 100644
--- a/content/public/common/speech_recognition_error.h
+++ b/content/public/common/speech_recognition_error.h
@@ -7,10 +7,34 @@
 
 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.