Remove the 2-level input method system & InputMethodBridge.

ui/views/controls/combobox/combobox_unittest.cc

 // Copyright 2013 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 "ui/views/controls/combobox/combobox.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
+#include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/menu_runner_handler.h"
-#include "ui/views/ime/mock_input_method.h"
 #include "ui/views/test/menu_runner_test_api.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 
 namespace views {
 
 namespace {
 
@@ skipping 163 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(TestComboboxListener);
 };
 
 }  // namespace
 
 class ComboboxTest : public ViewsTestBase {
  public:
   ComboboxTest() : widget_(NULL), combobox_(NULL) {}
 
+  void SetUp() override {
+    ui::SetUpInputMethodFactoryForTesting();
+    ViewsTestBase::SetUp();
+  }
+
   void TearDown() override {
     if (widget_)
       widget_->Close();
     ViewsTestBase::TearDown();
   }
 
   void InitCombobox(const std::set<int>* separators) {
     model_.reset(new TestComboboxModel());
 
     if (separators)
       model_->SetSeparators(*separators);
 
     ASSERT_FALSE(combobox_);
     combobox_ = new TestCombobox(model_.get());
     combobox_->set_id(1);
 
     widget_ = new Widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
     params.bounds = gfx::Rect(200, 200, 200, 200);
     widget_->Init(params);
     View* container = new View();
     widget_->SetContentsView(container);
     container->AddChildView(combobox_);
 
-    widget_->ReplaceInputMethod(new MockInputMethod);
-
-    // Assumes the Widget is always focused.
-    widget_->GetInputMethod()->OnFocus();
-
     combobox_->RequestFocus();
     combobox_->SizeToPreferredSize();
   }
 
  protected:
   void SendKeyEvent(ui::KeyboardCode key_code) {
     SendKeyEventWithType(key_code, ui::ET_KEY_PRESSED);
   }
 
   void SendKeyEventWithType(ui::KeyboardCode key_code, ui::EventType type) {
     ui::KeyEvent event(type, key_code, ui::EF_NONE);
-    widget_->GetInputMethod()->DispatchKeyEvent(event);
+    FocusManager* focus_manager = widget_->GetFocusManager();
+    widget_->OnKeyEvent(&event);
+    if (!event.handled() && focus_manager)
+      focus_manager->OnKeyEvent(event);
   }
 
   View* GetFocusedView() {
     return widget_->GetFocusManager()->GetFocusedView();
   }
 
   void PerformClick(const gfx::Point& point) {
     ui::MouseEvent pressed_event = ui::MouseEvent(
         ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
@@ skipping 409 matching lines @@
   EXPECT_EQ(short_item_width, combobox.content_size_.width());
 }
 
 TEST_F(ComboboxTest, TypingPrefixNotifiesListener) {
   InitCombobox(NULL);
 
   TestComboboxListener listener;
   combobox_->set_listener(&listener);
 
   // Type the first character of the second menu item ("JELLY").
   combobox_->GetTextInputClient()->InsertChar('J', ui::EF_NONE);

[yukawa, 2015/06/16 02:45:03]

Can this be rewritten with InputMethod::GetTextInputClient() ?

[Shu Chen, 2015/06/16 05:15:26]

Done.

   EXPECT_EQ(1, listener.actions_performed());
   EXPECT_EQ(1, listener.perform_action_index());
 
   // Type the second character of "JELLY", item shouldn't change and
   // OnPerformAction() shouldn't be re-called.
   combobox_->GetTextInputClient()->InsertChar('E', ui::EF_NONE);
   EXPECT_EQ(1, listener.actions_performed());
   EXPECT_EQ(1, listener.perform_action_index());
 
   // Clears the typed text.
   combobox_->OnBlur();
 
   // Type the first character of "PEANUT BUTTER", which should change the
   // selected index and perform an action.
   combobox_->GetTextInputClient()->InsertChar('P', ui::EF_NONE);

[yukawa, 2015/06/16 02:45:03]

Is this a realistic scenario?  Can Combobox receive character events via
TextInputClient after Combobox::OnBlur is called?

[Shu Chen, 2015/06/16 05:15:26]

I think combobox_->RequestFocus() should be added here.

   EXPECT_EQ(2, listener.actions_performed());
   EXPECT_EQ(2, listener.perform_action_index());
 }
 
 }  // namespace views