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

content/browser/speech/google_streaming_remote_engine.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 "content/browser/speech/google_streaming_remote_engine.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 418 matching lines @@
         // TODO(hans): We need a better error code for this.
         return Abort(SPEECH_RECOGNITION_ERROR_ABORTED);
       case proto::SpeechRecognitionEvent::STATUS_BAD_GRAMMAR:
         return Abort(SPEECH_RECOGNITION_ERROR_BAD_GRAMMAR);
       case proto::SpeechRecognitionEvent::STATUS_LANGUAGE_NOT_SUPPORTED:
         // TODO(hans): We need a better error code for this.
         return Abort(SPEECH_RECOGNITION_ERROR_ABORTED);
     }
   }
 
+  SpeechRecognitionResults results;
   for (int i = 0; i < ws_event.result_size(); ++i) {
     const proto::SpeechRecognitionResult& ws_result = ws_event.result(i);
-    SpeechRecognitionResult result;
+    results.push_back(SpeechRecognitionResult());
+    SpeechRecognitionResult& result = results.back();
     result.is_provisional = !(ws_result.has_final() && ws_result.final());
 
     if (!result.is_provisional)
       got_last_definitive_result_ = true;
 
     for (int j = 0; j < ws_result.alternative_size(); ++j) {
       const proto::SpeechRecognitionAlternative& ws_alternative =
           ws_result.alternative(j);
       SpeechRecognitionHypothesis hypothesis;
       if (ws_alternative.has_confidence())
         hypothesis.confidence = ws_alternative.confidence();
       else if (ws_result.has_stability())
         hypothesis.confidence = ws_result.stability();
       DCHECK(ws_alternative.has_transcript());
       // TODO(hans): Perhaps the transcript should be required in the proto?
       if (ws_alternative.has_transcript())
         hypothesis.utterance = UTF8ToUTF16(ws_alternative.transcript());
 
       result.hypotheses.push_back(hypothesis);
     }
+  }
 
-    delegate()->OnSpeechRecognitionEngineResult(result);
-  }
+  delegate()->OnSpeechRecognitionEngineResults(results);
 
   return state_;
 }
 
 GoogleStreamingRemoteEngine::FSMState
 GoogleStreamingRemoteEngine::RaiseNoMatchErrorIfGotNoResults(
     const FSMEventArgs& event_args) {
   if (!got_last_definitive_result_) {
     // Provide an empty result to notify that recognition is ended with no
     // errors, yet neither any further results.
-    delegate()->OnSpeechRecognitionEngineResult(SpeechRecognitionResult());
+    delegate()->OnSpeechRecognitionEngineResults(SpeechRecognitionResults());
   }
   return AbortSilently(event_args);
 }
 
 GoogleStreamingRemoteEngine::FSMState
 GoogleStreamingRemoteEngine::CloseUpstreamAndWaitForResults(
     const FSMEventArgs&) {
   DCHECK(upstream_fetcher_.get());
   DCHECK(encoder_.get());
 
@@ skipping 100 matching lines @@
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::FSMEventArgs(FSMEvent event_value)
     : event(event_value) {
 }
 
 GoogleStreamingRemoteEngine::FSMEventArgs::~FSMEventArgs() {
 }
 
 }  // namespace content