Revert 170701 since the WebKit change has now been rolled in again.

content/browser/speech/speech_recognition_engine.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_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/public/common/speech_recognition_grammar.h"
+#include "content/public/common/speech_recognition_result.h"
 
 namespace content {
 
 class AudioChunk;
-struct SpeechRecognitionResult;
 struct SpeechRecognitionError;
 
 // This interface models the basic contract that a speech recognition engine,
 // either working locally or relying on a remote web-service, must obey.
 // The expected call sequence for exported methods is:
 // StartRecognition      Mandatory at beginning of SR.
 //   TakeAudioChunk      For every audio chunk pushed.
 //   AudioChunksEnded    Finalize the audio stream (omitted in case of errors).
 // EndRecognition        Mandatory at end of SR (even on errors).
 // No delegate callbacks are allowed before StartRecognition or after
 // EndRecognition. If a recognition was started, the caller can free the
 // SpeechRecognitionEngine only after calling EndRecognition.
 class SpeechRecognitionEngine {
  public:
   // Interface for receiving callbacks from this object.
   class Delegate {
    public:
     // Called whenever a result is retrieved. It might be issued several times,
     // (e.g., in the case of continuous speech recognition engine
     // implementations).
-    virtual void OnSpeechRecognitionEngineResult(
-        const SpeechRecognitionResult& result) = 0;
+    virtual void OnSpeechRecognitionEngineResults(
+        const SpeechRecognitionResults& results) = 0;
     virtual void OnSpeechRecognitionEngineError(
         const SpeechRecognitionError& error) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
   // Remote engine configuration.
   struct CONTENT_EXPORT Config {
     Config();
@@ skipping 53 matching lines @@
 
 // These typedefs are to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error.
 typedef SpeechRecognitionEngine::Delegate SpeechRecognitionEngineDelegate;
 typedef SpeechRecognitionEngine::Config SpeechRecognitionEngineConfig;
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_ENGINE_H_