wip: Add ui::EventType parameter.

chrome/browser/chromeos/input_method/input_method_manager_impl_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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 622 matching lines @@
 }
 
 TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithUsLayouts) {
   manager_->EnableLayouts("en-US", "xkb:us::eng");
   EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
 
   // Henkan, Muhenkan, ZenkakuHankaku should be ignored when no Japanese IMEs
   // and keyboards are enabled.
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
 
   // Do the same tests for Korean.
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN)));
+      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
 }
 
 TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpLayout) {
   // Enable "xkb:jp::jpn" and press Muhenkan/ZenkakuHankaku.
   manager_->EnableLayouts("ja", "xkb:us::eng");
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
   manager_->SwitchToPreviousInputMethod();
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
   manager_->SwitchToPreviousInputMethod();
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
 }
 
 TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithKoLayout) {
   // Do the same tests for Korean.
   manager_->EnableLayouts("ko", "xkb:us::eng");
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
   manager_->SwitchToPreviousInputMethod();
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN)));
+      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
 }
 
 TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithJpIme) {
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   std::vector<std::string> ids;
   ids.push_back("xkb:jp::jpn");
   ids.push_back("mozc-jp");
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_DBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_CONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
 
   // Add Dvorak.
   ids.push_back("xkb:us:dvorak:eng");
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("mozc-jp", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_DBE_SBCSCHAR, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:jp::jpn", manager_->GetCurrentInputMethod().id());
 }
 
 TEST_F(InputMethodManagerImplTest, TestSwitchInputMethodWithKoIme) {
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
   std::vector<std::string> ids;
   ids.push_back("xkb:kr:kr104:kor");
   ids.push_back("mozc-hangul");
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("mozc-hangul", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_HANGUL, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
 
   // Add Dvorak.
   ids.push_back("xkb:us:dvorak:eng");
   EXPECT_TRUE(manager_->EnableInputMethods(ids));
   EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN)));
+      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("mozc-hangul", manager_->GetCurrentInputMethod().id());
   EXPECT_TRUE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN)));
+      ui::Accelerator(ui::VKEY_SPACE, ui::EF_SHIFT_DOWN, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:kr:kr104:kor", manager_->GetCurrentInputMethod().id());
 }
 
 TEST_F(InputMethodManagerImplTest, TestEnableDisableHotkeys) {
   manager_->EnableLayouts("ja", "xkb:us::eng");
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   manager_->DisableHotkeys();
   EXPECT_FALSE(manager_->SwitchToNextInputMethod());
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_FALSE(manager_->SwitchToPreviousInputMethod());
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   EXPECT_FALSE(manager_->SwitchInputMethod(
-      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE)));
+      ui::Accelerator(ui::VKEY_NONCONVERT, ui::EF_NONE, ui::ET_KEY_PRESSED)));
   EXPECT_EQ("xkb:us::eng", manager_->GetCurrentInputMethod().id());
   manager_->EnableHotkeys();
   EXPECT_TRUE(manager_->SwitchToNextInputMethod());
   EXPECT_NE("xkb:us::eng", manager_->GetCurrentInputMethod().id());
 }
 
 TEST_F(InputMethodManagerImplTest, TestAddRemoveExtensionInputMethods) {
   TestObserver observer;
   manager_->AddObserver(&observer);
   manager_->SetState(InputMethodManager::STATE_BROWSER_SCREEN);
@@ skipping 114 matching lines @@
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, controller_->reset_count_);
   manager_->ChangeInputMethod("mozc");
   EXPECT_EQ(1, controller_->reset_count_);
   manager_->ChangeInputMethod("xkb:us::eng");
   EXPECT_EQ(2, controller_->reset_count_);
 }
 
 }  // namespace input_method
 }  // namespace chromeos