Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: chromeos/dbus/ibus/ibus_engine_service_unittest.cc

Issue 14404007: Fix crash on extension IME reloading on Linux Desktop with chromeos=1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/ibus/ibus_engine_service.cc ('k') | chromeos/dbus/ibus/mock_ibus_engine_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_engine_service_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
index 0df3ffcce960a5f44f3108b7f73cd395c7d1b109..90dd53d1bfea832d53ce08037de01a852e3b008b 100644
--- a/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_engine_service_unittest.cc
@@ -539,7 +539,7 @@ TEST_F(IBusEngineServiceTest, FocusInTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, FocusIn()).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kFocusInMethod].Run(
@@ -572,7 +572,7 @@ TEST_F(IBusEngineServiceTest, FocusOutTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, FocusOut()).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kFocusOutMethod].Run(
@@ -605,7 +605,7 @@ TEST_F(IBusEngineServiceTest, EnableTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, Enable()).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kEnableMethod].Run(
@@ -638,7 +638,7 @@ TEST_F(IBusEngineServiceTest, DisableTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, Disable()).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kDisableMethod].Run(
@@ -678,7 +678,7 @@ TEST_F(IBusEngineServiceTest, PropertyActivateTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, PropertyActivate(kPropertyName,
kIBusPropertyState)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
@@ -712,7 +712,7 @@ TEST_F(IBusEngineServiceTest, ResetTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, Reset()).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kResetMethod].Run(
@@ -748,7 +748,7 @@ TEST_F(IBusEngineServiceTest, PropertyShowTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, PropertyShow(kPropertyName)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kPropertyShowMethod].Run(
@@ -784,7 +784,7 @@ TEST_F(IBusEngineServiceTest, PropertyHideTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, PropertyHide(kPropertyName)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kPropertyHideMethod].Run(
@@ -821,7 +821,7 @@ TEST_F(IBusEngineServiceTest, SetCapabilityTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, SetCapability(kIBusCapability)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
method_callback_map_[ibus::engine::kSetCapabilityMethod].Run(
@@ -866,7 +866,7 @@ TEST_F(IBusEngineServiceTest, ProcessKeyEventTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_,
ProcessKeyEvent(kKeySym, kKeyCode, kState, _)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
@@ -915,7 +915,7 @@ TEST_F(IBusEngineServiceTest, DelayProcessKeyEventTest) {
message_loop_.RunUntilIdle();
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_,
ProcessKeyEvent(kKeySym, kKeyCode, kState, _)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
@@ -957,7 +957,7 @@ TEST_F(IBusEngineServiceTest, CandidateClickedTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, CandidateClicked(kIndex, kIBusMouseButton,
kState)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
@@ -999,7 +999,7 @@ TEST_F(IBusEngineServiceTest, SetSurroundingTextTest) {
base::Unretained(&response_sender)));
// Call exported function without engine.
- service_->UnsetEngine();
+ service_->UnsetEngine(engine_handler_.get());
EXPECT_CALL(*engine_handler_, SetSurroundingText(kText, kCursorPos,
kAnchorPos)).Times(0);
EXPECT_CALL(response_sender, MockRun(_)).Times(0);
« no previous file with comments | « chromeos/dbus/ibus/ibus_engine_service.cc ('k') | chromeos/dbus/ibus/mock_ibus_engine_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698