Move SetCursorLocation bypass code.

ui/base/ime/input_method_ibus_unittest.cc

Index: ui/base/ime/input_method_ibus_unittest.cc
diff --git a/ui/base/ime/input_method_ibus_unittest.cc b/ui/base/ime/input_method_ibus_unittest.cc
index f79777d76c1575c3c226f16580a50f642c2a41d2..e10ba4d404244dd9df11f09d7bec3c14552d230d 100644
--- a/ui/base/ime/input_method_ibus_unittest.cc
+++ b/ui/base/ime/input_method_ibus_unittest.cc
@@ -810,9 +810,7 @@ TEST_F(InputMethodIBusTest, FocusIn_Text) {
   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
@@ -883,9 +881,7 @@ TEST_F(InputMethodIBusTest, FocusOut_Url) {
 }
 
 // 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;
@@ -1180,6 +1176,7 @@ class InputMethodIBusKeyEventTest : public InputMethodIBusTest {
     chromeos::DBusThreadManager::Get()->InitIBusBus("dummy address");
     ime_->Init(true);
     ime_->OnConnected();
+    mock_ibus_input_context_client_->SetIsXKBLayout(false);
   }
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodIBusKeyEventTest);