Revert of Ozone support for device special cases in keyboard event rewriting.

ash/virtual_keyboard_controller_unittest.cc

 // Copyright 2014 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 "ash/virtual_keyboard_controller.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
@@ skipping 28 matching lines @@
 
   void UpdateKeyboardDevices(std::vector<ui::KeyboardDevice> keyboard_devices) {
     ui::DeviceHotplugEventObserver* manager =
         ui::DeviceDataManager::GetInstance();
     manager->OnKeyboardDevicesUpdated(keyboard_devices);
   }
 
   // Sets the event blocker on the maximized window controller.
   void SetEventBlocker(
       scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker) {
-    Shell::GetInstance()->maximize_mode_controller()->event_blocker_ =
-        blocker.Pass();
+    Shell::GetInstance()
+        ->maximize_mode_controller()
+        ->event_blocker_ = blocker.Pass();
   }
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         keyboard::switches::kDisableSmartVirtualKeyboard);
     AshTestBase::SetUp();
     UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
     UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
   }
 
@@ skipping 15 matching lines @@
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 // Mock event blocker that enables the internal keyboard when it's destructor
 // is called.
 class MockEventBlocker : public ScopedDisableInternalMouseAndKeyboard {
  public:
   MockEventBlocker() {}
   ~MockEventBlocker() override {
     std::vector<ui::KeyboardDevice> keyboards;
-    keyboards.push_back(ui::KeyboardDevice(
-        1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard"));
+    keyboards.push_back(
+        ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
     ui::DeviceHotplugEventObserver* manager =
         ui::DeviceDataManager::GetInstance();
     manager->OnKeyboardDevicesUpdated(keyboards);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockEventBlocker);
 };
 
 // Tests that reenabling keyboard devices while shutting down does not
 // cause the Virtual Keyboard Controller to crash. See crbug.com/446204.
 TEST_F(VirtualKeyboardControllerTest, RestoreKeyboardDevices) {
   // Toggle maximized mode on.
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
-  scoped_ptr<ScopedDisableInternalMouseAndKeyboard> blocker(
-      new MockEventBlocker);
+  scoped_ptr<ScopedDisableInternalMouseAndKeyboard>
+      blocker(new MockEventBlocker);
   SetEventBlocker(blocker.Pass());
 }
 
 class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,
                                           public VirtualKeyboardObserver {
  public:
   VirtualKeyboardControllerAutoTest() : notified_(false), suppressed_(false) {}
   ~VirtualKeyboardControllerAutoTest() override {}
 
   void SetUp() override {
@@ skipping 33 matching lines @@
   // Whether the keeyboard is suppressed.
   bool suppressed_;
 
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardControllerAutoTest);
 };
 
 // Tests that the onscreen keyboard is disabled if an internal keyboard is
 // present and maximized mode is disabled.
 TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfInternalKeyboardPresent) {
   std::vector<ui::TouchscreenDevice> screens;
-  screens.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,
-                            "Touchscreen", gfx::Size(1024, 768), 0));
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
   // Remove the internal keyboard. Virtual keyboard should now show.
   UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
   EXPECT_TRUE(keyboard::IsKeyboardEnabled());
   // Replug in the internal keyboard. Virtual keyboard should hide.
   UpdateKeyboardDevices(keyboards);
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 TEST_F(VirtualKeyboardControllerAutoTest, DisabledIfNoTouchScreen) {
   std::vector<ui::TouchscreenDevice> devices;
   // Add a touchscreen. Keyboard should deploy.
-  devices.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL,
-                            "Touchscreen", gfx::Size(800, 600), 0));
+  devices.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, gfx::Size(800, 600), 0));
   UpdateTouchscreenDevices(devices);
   EXPECT_TRUE(keyboard::IsKeyboardEnabled());
   // Remove touchscreen. Keyboard should hide.
   UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 TEST_F(VirtualKeyboardControllerAutoTest, SuppressedIfExternalKeyboardPresent) {
   std::vector<ui::TouchscreenDevice> screens;
-  screens.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,
-                            "Touchscreen", gfx::Size(1024, 768), 0));
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
   ASSERT_TRUE(notified());
   ASSERT_TRUE(IsVirtualKeyboardSuppressed());
   // Toggle show keyboard. Keyboard should be visible.
   ResetObserver();
   Shell::GetInstance()
       ->virtual_keyboard_controller()
       ->ToggleIgnoreExternalKeyboard();
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
@@ skipping 12 matching lines @@
   ResetObserver();
   UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
   ASSERT_TRUE(notified());
   ASSERT_FALSE(IsVirtualKeyboardSuppressed());
 }
 
 // Tests handling multiple keyboards. Catches crbug.com/430252
 TEST_F(VirtualKeyboardControllerAutoTest, HandleMultipleKeyboardsPresent) {
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard"));
-  keyboards.push_back(ui::KeyboardDevice(
-      2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
-  keyboards.push_back(ui::KeyboardDevice(
-      3, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
+  keyboards.push_back(
+      ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
+  keyboards.push_back(
+      ui::KeyboardDevice(3, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 // Tests maximized mode interaction without disabling the internal keyboard.
 TEST_F(VirtualKeyboardControllerAutoTest, EnabledDuringMaximizeMode) {
   std::vector<ui::TouchscreenDevice> screens;
-  screens.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,
-                            "Touchscreen", gfx::Size(1024, 768), 0));
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
   // Toggle maximized mode on.
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
   // Toggle maximized mode off.
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(false);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 // Tests that keyboard gets suppressed in maximized mode.
 TEST_F(VirtualKeyboardControllerAutoTest, SuppressedInMaximizedMode) {
   std::vector<ui::TouchscreenDevice> screens;
-  screens.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,
-                            "Touchscreen", gfx::Size(1024, 768), 0));
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "Keyboard"));
-  keyboards.push_back(ui::KeyboardDevice(
-      2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "Keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL));
+  keyboards.push_back(
+      ui::KeyboardDevice(2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   UpdateKeyboardDevices(keyboards);
   // Toggle maximized mode on.
   Shell::GetInstance()
       ->maximize_mode_controller()
       ->EnableMaximizeModeWindowManager(true);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
   ASSERT_TRUE(notified());
   ASSERT_TRUE(IsVirtualKeyboardSuppressed());
   // Toggle show keyboard. Keyboard should be visible.
   ResetObserver();
@@ skipping 40 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardControllerAlwaysEnabledTest);
 };
 
 // Tests that the controller cannot suppress the keyboard if the virtual
 // keyboard always enabled flag is active.
 TEST_F(VirtualKeyboardControllerAlwaysEnabledTest, DoesNotSuppressKeyboard) {
   std::vector<ui::TouchscreenDevice> screens;
-  screens.push_back(
-      ui::TouchscreenDevice(1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL,
-                            "Touchscreen", gfx::Size(1024, 768), 0));
+  screens.push_back(ui::TouchscreenDevice(
+      1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, gfx::Size(1024, 768), 0));
   UpdateTouchscreenDevices(screens);
   std::vector<ui::KeyboardDevice> keyboards;
-  keyboards.push_back(ui::KeyboardDevice(
-      1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
+  keyboards.push_back(
+      ui::KeyboardDevice(1, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL));
   UpdateKeyboardDevices(keyboards);
   ASSERT_TRUE(keyboard::IsKeyboardEnabled());
 }
 
 }  // namespace test
 }  // namespace ash