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

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 "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"
@@ skipping 22 matching lines @@
     manager->OnTouchscreenDevicesUpdated(touchscreen_devices);
   }
 
   void UpdateKeyboardDevices(std::vector<ui::KeyboardDevice> keyboard_devices) {
     ui::DeviceHotplugEventObserver* manager =
         ui::DeviceDataManager::GetInstance();
     manager->OnKeyboardDevicesUpdated(keyboard_devices);
   }
 
   void SetUp() override {
+    CommandLine::ForCurrentProcess()->AppendSwitch(
+        keyboard::switches::kDisableSmartVirtualKeyboard);
     AshTestBase::SetUp();
     UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
     UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VirtualKeyboardControllerTest);
 };
 
 TEST_F(VirtualKeyboardControllerTest, EnabledDuringMaximizeMode) {
@@ skipping 10 matching lines @@
   EXPECT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 class VirtualKeyboardControllerAutoTest : public VirtualKeyboardControllerTest,
                                           public VirtualKeyboardObserver {
  public:
   VirtualKeyboardControllerAutoTest() : notified_(false), suppressed_(false) {}
   ~VirtualKeyboardControllerAutoTest() override {}
 
   void SetUp() override {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        keyboard::switches::kAutoVirtualKeyboard);
-    VirtualKeyboardControllerTest::SetUp();
+    AshTestBase::SetUp();
+    // Set the current list of devices to empty so that they don't interfere
+    // with the test.
+    UpdateKeyboardDevices(std::vector<ui::KeyboardDevice>());
+    UpdateTouchscreenDevices(std::vector<ui::TouchscreenDevice>());
     Shell::GetInstance()->system_tray_notifier()->AddVirtualKeyboardObserver(
         this);
   }
 
   void TearDown() override {
     Shell::GetInstance()->system_tray_notifier()->RemoveVirtualKeyboardObserver(
         this);
     AshTestBase::TearDown();
   }
 
@@ skipping 107 matching lines @@
   keyboards.push_back(ui::KeyboardDevice(
       2, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
   keyboards.push_back(ui::KeyboardDevice(
       3, ui::InputDeviceType::INPUT_DEVICE_EXTERNAL, "keyboard"));
   UpdateKeyboardDevices(keyboards);
   ASSERT_FALSE(keyboard::IsKeyboardEnabled());
 }
 
 }  // namespace test
 }  // namespace ash