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

chrome/browser/speech/speech_input_extension_manager.cc

 // 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.
 
 #include "chrome/browser/speech/speech_input_extension_manager.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 245 matching lines @@
       extensions::ExtensionSystem::Get(profile_)->process_manager();
   DCHECK(epm);
   extensions::ExtensionHost* eh =
       epm->GetBackgroundHostForExtension(extension_id);
   DCHECK(eh);
   content::RenderProcessHost* rph = eh->render_process_host();
   DCHECK(rph);
   return rph->GetID();
 }
 
-void SpeechInputExtensionManager::OnRecognitionResult(
+void SpeechInputExtensionManager::OnRecognitionResults(
     int session_id,
-    const content::SpeechRecognitionResult& result) {
+    const content::SpeechRecognitionResults& results) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(session_id, speech_recognition_session_id_);
 
   // Stopping will start the disassociation with the extension.
   // Make a copy to report the results to the proper one.
   std::string extension_id = extension_id_in_use_;
   ForceStopOnIOThread();
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-      base::Bind(&SpeechInputExtensionManager::SetRecognitionResultOnUIThread,
-      this, result, extension_id));
+      base::Bind(&SpeechInputExtensionManager::SetRecognitionResultsOnUIThread,
+      this, results, extension_id));
 }
 
-void SpeechInputExtensionManager::SetRecognitionResultOnUIThread(
-    const content::SpeechRecognitionResult& result,
+void SpeechInputExtensionManager::SetRecognitionResultsOnUIThread(
+    const content::SpeechRecognitionResults& results,
     const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  scoped_ptr<ListValue> args(new ListValue());
-  DictionaryValue* js_event = new DictionaryValue();
-  args->Append(js_event);
+  content::SpeechRecognitionResults::const_iterator it = results.begin();
+  for (; it != results.end(); ++it) {
+    const content::SpeechRecognitionResult& result = (*it);
 
-  ListValue* js_hypothesis_array = new ListValue();
-  js_event->Set(kHypothesesKey, js_hypothesis_array);
+    scoped_ptr<ListValue> args(new ListValue());
+    DictionaryValue* js_event = new DictionaryValue();
+    args->Append(js_event);
 
-  for (size_t i = 0; i < result.hypotheses.size(); ++i) {
-    const SpeechRecognitionHypothesis& hypothesis = result.hypotheses[i];
+    ListValue* js_hypothesis_array = new ListValue();
+    js_event->Set(kHypothesesKey, js_hypothesis_array);
 
-    DictionaryValue* js_hypothesis_object = new DictionaryValue();
-    js_hypothesis_array->Append(js_hypothesis_object);
+    for (size_t i = 0; i < result.hypotheses.size(); ++i) {
+      const SpeechRecognitionHypothesis& hypothesis = result.hypotheses[i];
 
-    js_hypothesis_object->SetString(kUtteranceKey,
-        UTF16ToUTF8(hypothesis.utterance));
-    js_hypothesis_object->SetDouble(kConfidenceKey,
-        hypothesis.confidence);
+      DictionaryValue* js_hypothesis_object = new DictionaryValue();
+      js_hypothesis_array->Append(js_hypothesis_object);
+
+      js_hypothesis_object->SetString(kUtteranceKey,
+          UTF16ToUTF8(hypothesis.utterance));
+      js_hypothesis_object->SetDouble(kConfidenceKey,
+          hypothesis.confidence);
+    }
+
+    DispatchEventToExtension(extension_id, kOnResultEvent, args.Pass());
   }
-
-  DispatchEventToExtension(extension_id, kOnResultEvent, args.Pass());
 }
 
 void SpeechInputExtensionManager::OnRecognitionStart(int session_id) {
   DCHECK_EQ(session_id, speech_recognition_session_id_);
 }
 
 void SpeechInputExtensionManager::OnAudioStart(int session_id) {
   VLOG(1) << "OnAudioStart";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK_EQ(session_id, speech_recognition_session_id_);
@@ skipping 434 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_RECORDING_STOPPED,
       // Guarded by the state_ == kShutdown check.
       content::Source<Profile>(profile_),
       content::Details<std::string>(&extension_id));
 }
 
 void SpeechInputExtensionManager::OnAudioLevelsChange(int session_id,
                                                       float volume,
                                                       float noise_volume) {}