Index: ui/keyboard/keyboard_controller_unittest.cc |
diff --git a/ui/keyboard/keyboard_controller_unittest.cc b/ui/keyboard/keyboard_controller_unittest.cc |
index 39341d92f6cac791495ef2b98b801320b7d4d2e6..9688a2f51d1347a2da9adf7c11a765cf402e81cd 100644 |
--- a/ui/keyboard/keyboard_controller_unittest.cc |
+++ b/ui/keyboard/keyboard_controller_unittest.cc |
@@ -30,7 +30,6 @@ |
#include "ui/gfx/geometry/rect.h" |
#include "ui/keyboard/keyboard_controller_observer.h" |
#include "ui/keyboard/keyboard_controller_proxy.h" |
-#include "ui/keyboard/keyboard_switches.h" |
#include "ui/keyboard/keyboard_util.h" |
#include "ui/wm/core/default_activation_client.h" |
@@ -572,38 +571,4 @@ TEST_F(KeyboardControllerAnimationTest, ContainerShowWhileHide) { |
EXPECT_EQ(gfx::Transform(), layer->transform()); |
} |
-class KeyboardControllerUsabilityTest : public KeyboardControllerTest { |
- public: |
- KeyboardControllerUsabilityTest() {} |
- virtual ~KeyboardControllerUsabilityTest() {} |
- |
- virtual void SetUp() OVERRIDE { |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
- switches::kKeyboardUsabilityExperiment); |
- KeyboardControllerTest::SetUp(); |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(KeyboardControllerUsabilityTest); |
-}; |
- |
-TEST_F(KeyboardControllerUsabilityTest, KeyboardAlwaysVisibleInUsabilityTest) { |
- const gfx::Rect& root_bounds = root_window()->bounds(); |
- |
- ui::DummyTextInputClient input_client(ui::TEXT_INPUT_TYPE_TEXT); |
- ui::DummyTextInputClient no_input_client(ui::TEXT_INPUT_TYPE_NONE); |
- |
- aura::Window* keyboard_container(controller()->GetContainerWindow()); |
- keyboard_container->SetBounds(root_bounds); |
- root_window()->AddChild(keyboard_container); |
- |
- SetFocus(&input_client); |
- EXPECT_TRUE(keyboard_container->IsVisible()); |
- |
- SetFocus(&no_input_client); |
- // Keyboard should not hide itself after lost focus. |
- EXPECT_TRUE(keyboard_container->IsVisible()); |
- EXPECT_FALSE(WillHideKeyboard()); |
-} |
- |
} // namespace keyboard |