Turns on smart deployment of the virtual keyboard by default, and changes the flag to allow easy di…

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 dc45cc1413f4feeeff2d162441b667bbc1714822..08c054ce6f36ffbcd64bb0f5a0339be8310a4e8e 100644
--- a/ash/virtual_keyboard_controller_unittest.cc
+++ b/ash/virtual_keyboard_controller_unittest.cc
@@ -40,6 +40,8 @@ class VirtualKeyboardControllerTest : public AshTestBase {
   }
 
   void SetUp() override {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        keyboard::switches::kDisableSmartVirtualKeyboard);
     AshTestBase::SetUp();
     UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
     UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
@@ -70,9 +72,9 @@ class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,
   ~VirtualKeyboardControllerAutoTest() override {}
 
   void SetUp() override {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        keyboard::switches::kAutoVirtualKeyboard);
-    VirtualKeyboardControllerTest::SetUp();
+    AshTestBase::SetUp();
+    UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
+    UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
     Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver(
         this);
   }