Fixes smart deploy causing crash on shutdown.

ash/virtual_keyboard_controller_unittest.cc

Index: ash/virtual_keyboard_controller_unittest.cc
diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc
index ef271087f8e1b0330c0d408a439d97f46d4c8fdf..bac75fb03302a5f705d9e02fdf1b5c8b41edb194 100644
--- a/ash/virtual_keyboard_controller_unittest.cc
+++ b/ash/virtual_keyboard_controller_unittest.cc
@@ -4,10 +4,13 @@
 
 #include "ash/virtual_keyboard_controller.h"
 
+#include <vector>
+
 #include "ash/shell.h"
 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "base/command_line.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/device_hotplug_event_observer.h"
@@ -65,6 +68,39 @@ TEST_F(VirtualKeyboardControllerTest, EnabledDuringMaximizeMode) {
   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() {

[sky, 2015/01/06 22:34:04]

override

[rsadam, 2015/01/06 23:18:41]

Done.

+    std::vector<ui::KeyboardDevice> keyboards;
+    keyboards.push_back(ui::KeyboardDevice(
+        1, ui::InputDeviceType::INPUT_DEVICE_INTERNAL, "keyboard"));
+    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);
+  // Install event blocker.
+  Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->InstallEventBlockerForTest(blocker.Pass());
+}
+
 class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,
                                           public VirtualKeyboardObserver {
  public: