Refactoring of chrome speech recognition architecture (CL1.6)

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/tab_contents/tab_contents_wrapper.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
@@ skipping 77 matching lines @@
             new SpeechRecognitionBubbleController(this))) {
     EXPECT_EQ(NULL, test_fixture_);
     test_fixture_ = this;
   }
 
   ~SpeechRecognitionBubbleControllerTest() {
     test_fixture_ = NULL;
   }
 
   // SpeechRecognitionBubbleControllerDelegate methods.
-  virtual void InfoBubbleButtonClicked(int caller_id,
+  virtual void InfoBubbleButtonClicked(int session_id,
                                        SpeechRecognitionBubble::Button button) {
     VLOG(1) << "Received InfoBubbleButtonClicked for button " << button;
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     if (button == SpeechRecognitionBubble::BUTTON_CANCEL) {
       cancel_clicked_ = true;
     } else if (button == SpeechRecognitionBubble::BUTTON_TRY_AGAIN) {
       try_again_clicked_ = true;
     }
     message_loop()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
-  virtual void InfoBubbleFocusChanged(int caller_id) {
+  virtual void InfoBubbleFocusChanged(int session_id) {
     VLOG(1) << "Received InfoBubbleFocusChanged";
     EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::IO));
     focus_changed_ = true;
     message_loop()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
   // testing::Test methods.
   virtual void SetUp() {
     BrowserWithTestWindowTest::SetUp();
     SpeechRecognitionBubble::set_factory(
         &SpeechRecognitionBubbleControllerTest::CreateBubble);
     io_thread_.Start();
   }
 
   virtual void TearDown() {
     SpeechRecognitionBubble::set_factory(NULL);
     io_thread_.Stop();
     BrowserWithTestWindowTest::TearDown();
   }
 
   static void ActivateBubble() {
     if (MockSpeechRecognitionBubble::type() ==
         MockSpeechRecognitionBubble::BUBBLE_TEST_FOCUS_CHANGED) {
-      test_fixture_->controller_->SetBubbleWarmUpMode(kBubbleCallerId);
+      test_fixture_->controller_->SetBubbleWarmUpMode(kBubbleSessionId);
     } else {
-      test_fixture_->controller_->SetBubbleMessage(kBubbleCallerId,
+      test_fixture_->controller_->SetBubbleMessage(kBubbleSessionId,
                                                    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
     // active.
     MessageLoop::current()->PostTask(FROM_HERE,
                                      base::Bind(&ActivateBubble));
 
-    // The |tab_contents| parameter would be NULL since the dummy caller id
+    // The |tab_contents| parameter would be NULL since the dummy session id
     // passed to CreateBubble would not have matched any active tab. So get a
     // real WebContents pointer from the test fixture and pass that, because
     // the bubble controller registers for tab close notifications which need
     // a valid WebContents.
     TabContentsWrapper* wrapper =
         test_fixture_->browser()->GetSelectedTabContentsWrapper();
     if (wrapper)
       web_contents = wrapper->web_contents();
     return new MockSpeechRecognitionBubble(web_contents, delegate,
                                            element_rect);
   }
 
  protected:
   // The main thread of the test is marked as the IO thread and we create a new
   // one for the UI thread.
   content::TestBrowserThread io_thread_;
   bool cancel_clicked_;
   bool try_again_clicked_;
   bool focus_changed_;
   scoped_refptr<SpeechRecognitionBubbleController> controller_;
 
-  static const int kBubbleCallerId;
+  static const int kBubbleSessionId;
   static SpeechRecognitionBubbleControllerTest* test_fixture_;
 };
 
 SpeechRecognitionBubbleControllerTest*
 SpeechRecognitionBubbleControllerTest::test_fixture_ = NULL;
 
-const int SpeechRecognitionBubbleControllerTest::kBubbleCallerId = 1;
+const int SpeechRecognitionBubbleControllerTest::kBubbleSessionId = 1;
 
 MockSpeechRecognitionBubble::BubbleType MockSpeechRecognitionBubble::type_ =
     MockSpeechRecognitionBubble::BUBBLE_TEST_FOCUS_CHANGED;
 
 // Test that the speech bubble UI gets created in the UI thread and that the
 // focus changed callback comes back in the IO thread.
 TEST_F(SpeechRecognitionBubbleControllerTest, TestFocusChanged) {
   MockSpeechRecognitionBubble::set_type(
       MockSpeechRecognitionBubble::BUBBLE_TEST_FOCUS_CHANGED);
 
-  controller_->CreateBubble(kBubbleCallerId, 1, 1, gfx::Rect(1, 1));
+  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(kBubbleCallerId);
+  controller_->CloseBubble(kBubbleSessionId);
 }
 
 // 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(kBubbleCallerId, 1, 1, gfx::Rect(1, 1));
+  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(kBubbleCallerId);
+  controller_->CloseBubble(kBubbleSessionId);
 }
 
 // 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(kBubbleCallerId, 1, 1, gfx::Rect(1, 1));
+  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(kBubbleCallerId);
+  controller_->CloseBubble(kBubbleSessionId);
 }
 
 }  // namespace speech