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

chrome/browser/speech/speech_recognition_bubble_controller_unittest.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 "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/speech/speech_recognition_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 110 matching lines @@
     io_thread_.Start();
   }
 
   virtual void TearDown() {
     SpeechRecognitionBubble::set_factory(NULL);
     io_thread_.Stop();
     BrowserWithTestWindowTest::TearDown();
   }
 
   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"));
     }
   }
 
   static SpeechRecognitionBubble* CreateBubble(
       WebContents* web_contents,
       SpeechRecognitionBubble::Delegate* delegate,
       const gfx::Rect& element_rect) {
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
     // Set up to activate the bubble soon after it gets created, since we test
     // events sent by the bubble and those are handled only when the bubble is
@@ skipping 39 matching lines @@
 // focus changed callback comes back in the IO thread.
 TEST_F(SpeechRecognitionBubbleControllerTest, TestFocusChanged) {
   MockSpeechRecognitionBubble::set_type(
       MockSpeechRecognitionBubble::BUBBLE_TEST_FOCUS_CHANGED);
 
   controller_->CreateBubble(kBubbleSessionId, 1, 1, gfx::Rect(1, 1));
   MessageLoop::current()->Run();
   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
 // recognition cancelled callback comes back in the IO thread.
 TEST_F(SpeechRecognitionBubbleControllerTest, TestRecognitionCancelled) {
   MockSpeechRecognitionBubble::set_type(
       MockSpeechRecognitionBubble::BUBBLE_TEST_CLICK_CANCEL);
 
   controller_->CreateBubble(kBubbleSessionId, 1, 1, gfx::Rect(1, 1));
   MessageLoop::current()->Run();
   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
 // try-again button click event comes back in the IO thread.
 TEST_F(SpeechRecognitionBubbleControllerTest, TestTryAgainClicked) {
   MockSpeechRecognitionBubble::set_type(
       MockSpeechRecognitionBubble::BUBBLE_TEST_CLICK_TRY_AGAIN);
 
   controller_->CreateBubble(kBubbleSessionId, 1, 1, gfx::Rect(1, 1));
   MessageLoop::current()->Run();
   EXPECT_FALSE(cancel_clicked_);
   EXPECT_TRUE(try_again_clicked_);
   EXPECT_FALSE(focus_changed_);
-  controller_->CloseBubble(kBubbleSessionId);
+  controller_->CloseBubble();
 }
 
 }  // namespace speech