Applying changes to the existing speech input code to support the extension API.

content/browser/speech/speech_input_browsertest.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 91 matching lines @@
                                         int render_view_id,
                                         const gfx::Rect& element_rect) {}
   virtual void ShowWarmUp(int caller_id) {}
   virtual void ShowRecognizing(int caller_id) {}
   virtual void ShowRecording(int caller_id)  {}
   virtual void ShowInputVolume(int caller_id,
                                float volume,
                                float noise_volume) {}
   virtual void ShowNoMicError(int caller_id) {}
   virtual void ShowRecognizerError(int caller_id,
-                                   SpeechRecognizer::ErrorCode error) {}
+                                   SpeechInputError error) {}
   virtual void DoClose(int caller_id) {}
 
  private:
   void SetFakeRecognitionResult() {
     if (caller_id_) {  // Do a check in case we were cancelled..
       VLOG(1) << "Setting fake recognition result.";
       delegate_->DidCompleteRecording(caller_id_);
-      SpeechInputResultArray results;
-      results.push_back(SpeechInputResultItem(ASCIIToUTF16(kTestResult), 1.0));
+      SpeechInputResult results;
+      results.hypotheses.push_back(SpeechInputHypothesis(
+          ASCIIToUTF16(kTestResult), 1.0));
       delegate_->SetRecognitionResult(caller_id_, results);
       delegate_->DidCompleteRecognition(caller_id_);
       caller_id_ = 0;
       delegate_ = NULL;
       VLOG(1) << "Finished setting fake recognition result.";
     }
   }
 
   int caller_id_;
   Delegate* delegate_;
@@ skipping 116 matching lines @@
 
   // Make the renderer crash. This should trigger SpeechInputDispatcherHost to
   // cancel all pending sessions.
   GURL test_url("about:crash");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   EXPECT_TRUE(fake_speech_input_manager_.did_cancel_all());
 }
 
 }  // namespace speech_input