Index: ash/display/virtual_keyboard_window_controller_unittest.cc |
diff --git a/ash/display/virtual_keyboard_window_controller_unittest.cc b/ash/display/virtual_keyboard_window_controller_unittest.cc |
index e2538c1e5b74e21881e42c52c5504efb3e8c4261..50f05735911276a4bab0ab3bc7e41bd1b66b5944 100644 |
--- a/ash/display/virtual_keyboard_window_controller_unittest.cc |
+++ b/ash/display/virtual_keyboard_window_controller_unittest.cc |
@@ -39,44 +39,6 @@ class VirtualKeyboardWindowControllerTest : public AshTestBase { |
DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardWindowControllerTest); |
}; |
-class VirtualKeyboardUsabilityExperimentTest |
- : public VirtualKeyboardWindowControllerTest { |
- public: |
- VirtualKeyboardUsabilityExperimentTest() |
- : VirtualKeyboardWindowControllerTest() {} |
- virtual ~VirtualKeyboardUsabilityExperimentTest() {} |
- |
- virtual void SetUp() OVERRIDE { |
- if (SupportsMultipleDisplays()) { |
- CommandLine::ForCurrentProcess()->AppendSwitchASCII( |
- switches::kAshHostWindowBounds, "1+1-300x300,1+301-300x300"); |
- CommandLine::ForCurrentProcess()->AppendSwitch( |
- keyboard::switches::kKeyboardUsabilityExperiment); |
- } |
- test::AshTestBase::SetUp(); |
- } |
- |
- private: |
- DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardUsabilityExperimentTest); |
-}; |
- |
-TEST_F(VirtualKeyboardUsabilityExperimentTest, VirtualKeyboardWindowTest) { |
- if (!SupportsMultipleDisplays()) |
- return; |
- RunAllPendingInMessageLoop(); |
- set_virtual_keyboard_window_controller( |
- Shell::GetInstance()->display_controller()-> |
- virtual_keyboard_window_controller()); |
- EXPECT_TRUE(root_window_controller()); |
- aura::Window* container = root_window_controller()->GetContainer( |
- kShellWindowId_VirtualKeyboardContainer); |
- // Keyboard container is added to virtual keyboard window and its bounds is |
- // the same as root window. |
- EXPECT_TRUE(container); |
- EXPECT_EQ(container->bounds(), |
- root_window_controller()->GetRootWindow()->bounds()); |
-} |
- |
// Tests that the onscreen keyboard becomes enabled when maximize mode is |
// enabled. |
TEST_F(VirtualKeyboardWindowControllerTest, EnabledDuringMaximizeMode) { |