Cancel any pending speech recognitions when the dispatcher host terminates.

chrome/browser/speech/speech_input_browsertest.cc

 // Copyright (c) 2010 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/renderer_host/render_view_host.h"
 #include "chrome/browser/speech/speech_input_dispatcher_host.h"
@@ skipping 24 matching lines @@
   FakeSpeechInputManager()
       : caller_id_(0),
         delegate_(NULL) {
   }
 
   std::string grammar() {
     return grammar_;
   }
 
   // SpeechInputManager methods.
-  void StartRecognition(Delegate* delegate,
-                        int caller_id,
-                        int render_process_id,
-                        int render_view_id,
-                        const gfx::Rect& element_rect,
-                        const std::string& language,
-                        const std::string& grammar) {
+  virtual void StartRecognition(Delegate* delegate,
+                                int caller_id,
+                                int render_process_id,
+                                int render_view_id,
+                                const gfx::Rect& element_rect,
+                                const std::string& language,
+                                const std::string& grammar) {
     VLOG(1) << "StartRecognition invoked.";
     EXPECT_EQ(0, caller_id_);
     EXPECT_EQ(NULL, delegate_);
     caller_id_ = caller_id;
     delegate_ = delegate;
     grammar_ = grammar;
     // Give the fake result in a short while.
     MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(this,
         &FakeSpeechInputManager::SetFakeRecognitionResult));
   }
-  void CancelRecognition(int caller_id) {
+  virtual void CancelRecognition(int caller_id) {
     VLOG(1) << "CancelRecognition invoked.";
     EXPECT_EQ(caller_id_, caller_id);
     caller_id_ = 0;
     delegate_ = NULL;
   }
-  void StopRecording(int caller_id) {
+  virtual void StopRecording(int caller_id) {
     VLOG(1) << "StopRecording invoked.";
     EXPECT_EQ(caller_id_, caller_id);
     // Nothing to do here since we aren't really recording.
   }
+  virtual void CancelAllRequestsWithDelegate(Delegate* delegate) {
+    VLOG(1) << "CancelAllRequestsWithDelegate invoked.";
+    EXPECT_EQ(delegate_, delegate);
+  }
 
  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));
       delegate_->SetRecognitionResult(caller_id_, results);
       delegate_->DidCompleteRecognition(caller_id_);
@@ skipping 76 matching lines @@
 };
 
 SpeechInputManager* SpeechInputBrowserTest::speech_input_manager_ = NULL;
 
 // Marked as FLAKY due to http://crbug.com/51337
 //
 // TODO(satish): Once this flakiness has been fixed, add a second test here to
 // check for sending many clicks in succession to the speech button and verify
 // that it doesn't cause any crash but works as expected. This should act as the
 // test for http://crbug.com/59173
+//
+// TODO(satish): Similar to above, once this flakiness has been fixed add
+// another test here to check that when speech recognition is in progress and
+// the a renderer crashes, we get a call to

[bulach, 2011/01/20 14:47:20]

s/the //

[Satish, 2011/01/20 15:09:03]

Done.

+// SpeechInputManager::CancelAllRequestsWithDelegate.
 #if defined(OS_WIN)
 #define MAYBE_TestBasicRecognition FLAKY_TestBasicRecognition
 #else
 #define MAYBE_TestBasicRecognition TestBasicRecognition
 #endif
 IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, MAYBE_TestBasicRecognition) {
   LoadAndRunSpeechInputTest(FILE_PATH_LITERAL("basic_recognition.html"));
   EXPECT_TRUE(fake_speech_input_manager_.grammar().empty());
 }
 
 // Marked as FLAKY due to http://crbug.com/51337
 #if defined(OS_WIN)
 #define MAYBE_GrammarAttribute FLAKY_GrammarAttribute
 #else
 #define MAYBE_GrammarAttribute GrammarAttribute
 #endif
 IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, MAYBE_GrammarAttribute) {
   LoadAndRunSpeechInputTest(FILE_PATH_LITERAL("grammar_attribute.html"));
   EXPECT_EQ("http://example.com/grammar.xml",
             fake_speech_input_manager_.grammar());
 }
 
 }  // namespace speech_input