Revert 170668

content/renderer/speech_recognition_dispatcher.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_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
 #define CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
-#include "content/public/common/speech_recognition_result.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognitionHandle.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechRecognizer.h"
 
 namespace content {
 class RenderViewImpl;
 struct SpeechRecognitionError;
 struct SpeechRecognitionResult;
 
@@ skipping 19 matching lines @@
   virtual void abort(const WebKit::WebSpeechRecognitionHandle&,
                      WebKit::WebSpeechRecognizerClient*) OVERRIDE;
 
   void OnRecognitionStarted(int request_id);
   void OnAudioStarted(int request_id);
   void OnSoundStarted(int request_id);
   void OnSoundEnded(int request_id);
   void OnAudioEnded(int request_id);
   void OnErrorOccurred(int request_id, const SpeechRecognitionError& error);
   void OnRecognitionEnded(int request_id);
-  void OnResultsRetrieved(int request_id,
-                          const SpeechRecognitionResults& result);
+  void OnResultRetrieved(int request_id, const SpeechRecognitionResult& result);
 
   int GetOrCreateIDForHandle(const WebKit::WebSpeechRecognitionHandle& handle);
   bool HandleExists(const WebKit::WebSpeechRecognitionHandle& handle);
   const WebKit::WebSpeechRecognitionHandle& GetHandleFromID(int handle_id);
 
   // The WebKit client class that we use to send events back to the JS world.
   WebKit::WebSpeechRecognizerClient* recognizer_client_;
 
   typedef std::map<int, WebKit::WebSpeechRecognitionHandle> HandleMap;
   HandleMap handle_map_;
   int next_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SpeechRecognitionDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_SPEECH_RECOGNITION_DISPATCHER_H_