Move SetCursorLocation bypass code.

ui/base/ime/input_method_ibus_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 <X11/Xlib.h>
 #undef Bool
 #undef FocusIn
 #undef FocusOut
 #undef None
 
@@ skipping 792 matching lines @@
   // Click a text input form.
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->OnTextInputTypeChanged(this);
   // Start the daemon.
   chromeos::DBusThreadManager::Get()->InitIBusBus("dummy address");
   ime_->OnConnected();
   // A context should be created upon the signal delivery.
   EXPECT_EQ(1, mock_ibus_client_->create_input_context_call_count());
   // Since a form has focus, IBusClient::FocusIn() should be called.
   EXPECT_EQ(1, mock_ibus_input_context_client_->focus_in_call_count());
-  // TODO(nona): Change following expectation to 1 once new bypass
-  //             implementation is landed.
-  EXPECT_EQ(0,
+  EXPECT_EQ(1,
             mock_ibus_input_context_client_->set_cursor_location_call_count());
   // ui::TextInputClient::OnInputMethodChanged() should be called when
   // ui::InputMethodIBus connects/disconnects to/from ibus-daemon and the
   // current text input type is not NONE.
   EXPECT_EQ(1U, on_input_method_changed_call_count_);
 }
 
 // Confirm that IBusClient::FocusIn is NOT called on "connected" if input_type_
 // is PASSWORD.
 TEST_F(InputMethodIBusTest, FocusIn_Password) {
@@ skipping 50 matching lines @@
   EXPECT_EQ(1, mock_ibus_client_->create_input_context_call_count());
   EXPECT_EQ(1, mock_ibus_input_context_client_->focus_in_call_count());
   EXPECT_EQ(0, mock_ibus_input_context_client_->focus_out_call_count());
   input_type_ = TEXT_INPUT_TYPE_URL;
   ime_->OnTextInputTypeChanged(this);
   EXPECT_EQ(1, mock_ibus_input_context_client_->focus_in_call_count());
   EXPECT_EQ(0, mock_ibus_input_context_client_->focus_out_call_count());
 }
 
 // Test if the new |caret_bounds_| is correctly sent to ibus-daemon.
-// TODO(nona): Re-enable following tests once new bypas implementation is
-//             land.
-TEST_F(InputMethodIBusTest, DISABLED_OnCaretBoundsChanged) {
+TEST_F(InputMethodIBusTest, OnCaretBoundsChanged) {
   SetCreateContextSuccessHandler();
   chromeos::DBusThreadManager::Get()->InitIBusBus("dummy address");
   input_type_ = TEXT_INPUT_TYPE_TEXT;
   ime_->Init(true);
   EXPECT_EQ(0,
             mock_ibus_input_context_client_->set_cursor_location_call_count());
   caret_bounds_ = gfx::Rect(1, 2, 3, 4);
   ime_->OnCaretBoundsChanged(this);
   EXPECT_EQ(1,
             mock_ibus_input_context_client_->set_cursor_location_call_count());
@@ skipping 274 matching lines @@
  public:
   InputMethodIBusKeyEventTest() {}
   virtual ~InputMethodIBusKeyEventTest() {}
 
   virtual void SetUp() OVERRIDE {
     InputMethodIBusTest::SetUp();
     SetCreateContextSuccessHandler();
     chromeos::DBusThreadManager::Get()->InitIBusBus("dummy address");
     ime_->Init(true);
     ime_->OnConnected();
+    mock_ibus_input_context_client_->SetIsXKBLayout(false);
   }
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodIBusKeyEventTest);
 };
 
 TEST_F(InputMethodIBusKeyEventTest, KeyEventConsumeTest) {
   XEvent event = {};
   event.xkey.type = KeyPress;
 
   // Set up IBusKeyEventFromNativeKeyEvent result.
@@ skipping 464 matching lines @@
 
   // Do callback.
   success_consume_handler.RunCallback(KEYEVENT_CONSUME);
 
   EXPECT_EQ(0, ime_->process_key_event_post_ime_call_count());
 }
 
 // TODO(nona): Introduce ProcessKeyEventPostIME tests(crbug.com/156593).
 
 }  // namespace ui