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

chrome/browser/speech/speech_input_extension_manager.h

Index: chrome/browser/speech/speech_input_extension_manager.h
===================================================================
--- chrome/browser/speech/speech_input_extension_manager.h	(revision 170917)
+++ chrome/browser/speech/speech_input_extension_manager.h	(working copy)
@@ -125,8 +125,8 @@
   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,
@@ -166,8 +166,8 @@
   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();
Property changes on: chrome\browser\speech\speech_input_extension_manager.h
___________________________________________________________________
Added: svn:mergeinfo