Changing tab closure handling logic in speech recognition code and cleaning bubble controller. (Spe…

chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc

Index: chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
diff --git a/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc b/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
index 03a18fd0bd7ad78fc0be230abfbc11071c031759..5ccc34068f90b20bc530b9c4894f1598715ea869 100644
--- a/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
+++ b/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc
@@ -128,12 +128,9 @@ class SpeechRecognitionBubbleControllerTest
   }
 
   static void ActivateBubble() {
-    if (MockSpeechRecognitionBubble::type() ==
+    if (MockSpeechRecognitionBubble::type() !=
         MockSpeechRecognitionBubble::BUBBLE_TEST_FOCUS_CHANGED) {
-      test_fixture_->controller_->SetBubbleWarmUpMode(kBubbleSessionId);
-    } else {
-      test_fixture_->controller_->SetBubbleMessage(kBubbleSessionId,
-                                                   ASCIIToUTF16("Test"));
+      test_fixture_->controller_->SetBubbleMessage(ASCIIToUTF16("Test"));
     }
   }
 
@@ -193,7 +190,7 @@ TEST_F(SpeechRecognitionBubbleControllerTest, TestFocusChanged) {
   EXPECT_TRUE(focus_changed_);
   EXPECT_FALSE(cancel_clicked_);
   EXPECT_FALSE(try_again_clicked_);
-  controller_->CloseBubble(kBubbleSessionId);
+  controller_->CloseBubble();
 }
 
 // Test that the speech bubble UI gets created in the UI thread and that the
@@ -207,7 +204,7 @@ TEST_F(SpeechRecognitionBubbleControllerTest, TestRecognitionCancelled) {
   EXPECT_TRUE(cancel_clicked_);
   EXPECT_FALSE(try_again_clicked_);
   EXPECT_FALSE(focus_changed_);
-  controller_->CloseBubble(kBubbleSessionId);
+  controller_->CloseBubble();
 }
 
 // Test that the speech bubble UI gets created in the UI thread and that the
@@ -221,7 +218,7 @@ TEST_F(SpeechRecognitionBubbleControllerTest, TestTryAgainClicked) {
   EXPECT_FALSE(cancel_clicked_);
   EXPECT_TRUE(try_again_clicked_);
   EXPECT_FALSE(focus_changed_);
-  controller_->CloseBubble(kBubbleSessionId);
+  controller_->CloseBubble();
 }
 
 }  // namespace speech