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

chrome/browser/speech/speech_input_extension_manager.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 CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 107 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Methods from SpeechRecognitionEventListener.
   virtual void OnRecognitionStart(int session_id) OVERRIDE;
   virtual void OnAudioStart(int session_id) OVERRIDE;
   virtual void OnEnvironmentEstimationComplete(int session_id) OVERRIDE;
   virtual void OnSoundStart(int session_id) OVERRIDE;
   virtual void OnSoundEnd(int session_id) OVERRIDE;
   virtual void OnAudioEnd(int session_id) OVERRIDE;
-  virtual void OnRecognitionResult(
-      int session_id, const content::SpeechRecognitionResult& result) OVERRIDE;
+  virtual void OnRecognitionResults(
+      int session_id, const content::SpeechRecognitionResults& result) OVERRIDE;
   virtual void OnRecognitionError(
       int session_id, const content::SpeechRecognitionError& error) OVERRIDE;
   virtual void OnAudioLevelsChange(int session_id, float volume,
                                    float noise_volume) OVERRIDE;
   virtual void OnRecognitionEnd(int session_id) OVERRIDE;
 
   // Methods for API testing.
   void SetSpeechInputExtensionInterface(
       SpeechInputExtensionInterface* speech_interface);
 
@@ skipping 19 matching lines @@
   void StartOnIOThread(
       scoped_refptr<net::URLRequestContextGetter> context_getter,
       const std::string& extension_name,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities,
       int render_process_id);
   void ForceStopOnIOThread();
   void IsRecordingOnIOThread(const IsRecordingCallback& callback);
 
-  void SetRecognitionResultOnUIThread(
-      const content::SpeechRecognitionResult& result,
+  void SetRecognitionResultsOnUIThread(
+      const content::SpeechRecognitionResults& result,
       const std::string& extension_id);
   void DidStartReceivingAudioOnUIThread();
   void StopSucceededOnUIThread();
   void IsRecordingOnUIThread(const IsRecordingCallback& callback, bool result);
 
   void DispatchError(const std::string& error, bool dispatch_event);
   void DispatchEventToExtension(const std::string& extension_id,
                                 const std::string& event,
                                 scoped_ptr<base::ListValue> event_args);
   void ExtensionUnloaded(const std::string& extension_id);
@@ skipping 25 matching lines @@
   // Used in the UI thread.
   scoped_ptr<content::NotificationRegistrar> registrar_;
   SpeechInputExtensionInterface* speech_interface_;
 
   // Used in the IO thread.
   bool is_recognition_in_progress_;
   int speech_recognition_session_id_;
 };
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_