Remove the 2-level input method system & InputMethodBridge.

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 #include "ui/views/focus/focus_manager.h"
-#include "ui/views/ime/input_method.h"
 #include "ui/views/test/focus_manager_test.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "ui/wm/public/activation_client.h"
 
 #if defined(OS_WIN)
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ skipping 1523 matching lines @@
             parent->GetInputMethod()->GetTextInputType());
 
   ActivateSync(parent);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD,
             parent->GetInputMethod()->GetTextInputType());
 #endif
 
   parent->CloseNow();
 }
 
-// Test input method focus changes affected by focus changes cross 2 top
-// windows.
-TEST_F(WidgetInputMethodInteractiveTest, TwoTopWindows) {
-  Widget* widget1 = CreateWidget();
-  Widget* widget2 = CreateWidget();
-  Textfield* textfield1 = new Textfield;
-  Textfield* textfield2 = new Textfield;
-  textfield2->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
-  widget1->GetRootView()->AddChildView(textfield1);
-  widget2->GetRootView()->AddChildView(textfield2);
-
-  // Do the initial shows synchronously. Otherwise, on X11, the window server
-  // messages may be interleaved with the activation requests below.
-  ShowSync(widget1);
-  ShowSync(widget2);
-
-  textfield1->RequestFocus();
-  textfield2->RequestFocus();
-
-  ActivateSync(widget1);
-
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
-            widget1->GetInputMethod()->GetTextInputType());
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
-            widget2->GetInputMethod()->GetTextInputType());
-
-  ActivateSync(widget2);
-
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
-            widget1->GetInputMethod()->GetTextInputType());
-  EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD,
-            widget2->GetInputMethod()->GetTextInputType());
-
-  widget2->CloseNow();
-  widget1->CloseNow();
-}
-
 // Test input method focus changes affected by textfield's state changes.
 TEST_F(WidgetInputMethodInteractiveTest, TextField) {
   Widget* widget = CreateWidget();
   Textfield* textfield = new Textfield;
   widget->GetRootView()->AddChildView(textfield);
   ShowSync(widget);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget->GetInputMethod()->GetTextInputType());
 
   textfield->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget->GetInputMethod()->GetTextInputType());
 
   textfield->RequestFocus();
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_PASSWORD,
             widget->GetInputMethod()->GetTextInputType());
 
   textfield->SetTextInputType(ui::TEXT_INPUT_TYPE_TEXT);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_TEXT,
             widget->GetInputMethod()->GetTextInputType());
 
   textfield->SetReadOnly(true);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget->GetInputMethod()->GetTextInputType());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views